Merge remote-tracking branch 'origin/master'

src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java

@@ -139,8 +139,6 @@ public class DataPetitionComplaintController {
                         }
                     }
                 }
-
-
                 list.add(data);
             }
 
@@ -243,7 +241,7 @@ public class DataPetitionComplaintController {
     }
 
     /**
-     * 补充涉及问题
+     * 补充涉企涉冻问题
      * */
     @PostMapping("/replenishInvolvedIssue")
     public Result replenishInvolvedIssue(@RequestPart("file")MultipartFile file) throws IOException{
@@ -257,16 +255,11 @@ public class DataPetitionComplaintController {
         EasyExcel.read(file.getInputStream(),DataPetitionComplaintReplenishDto.class,new ReadListener<DataPetitionComplaintReplenishDto>(){
             @Override
             public void invoke(DataPetitionComplaintReplenishDto dto, AnalysisContext analysisContext) {
-
-                //专项督察
-                if(CollectionUtil.isNotEmpty(specialSupervisionDict)){
-                    String specialSupervision = specialSupervisionDict.stream().filter(dict->dict.getDictLabel().equals(dto.getInvolvedIssue())).findFirst().map(SupDictData::getDictValue).orElse("");
-                    LambdaUpdateWrapper<DataPetitionComplaint> updateWrapper =new LambdaUpdateWrapper<DataPetitionComplaint>()
-                            .set(DataPetitionComplaint::getInvolvedIssue,specialSupervision)
-                            .eq(DataPetitionComplaint::getOriginId,dto.getOriginId());
-                    if(StrUtil.isNotEmpty(dto.getOriginId()) && StrUtil.isNotEmpty(dto.getInvolvedIssue())){
-                        dataPetitionComplaintService.update(updateWrapper);
-                    }
+                LambdaUpdateWrapper<DataPetitionComplaint> updateWrapper =new LambdaUpdateWrapper<DataPetitionComplaint>()
+                        .set(DataPetitionComplaint::getInvolvedIssue,dto.getInvolvedIssue())
+                        .eq(DataPetitionComplaint::getOriginId,dto.getOriginId());
+                if(StrUtil.isNotEmpty(dto.getOriginId()) && StrUtil.isNotEmpty(dto.getInvolvedIssue())){
+                    dataPetitionComplaintService.update(updateWrapper);
                 }
 
             }

src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintGjImportDto.java

@@ -66,6 +66,7 @@ public class DataPetitionComplaintGjImportDto {
 
     @ExcelIgnore
     private String departId;
+    @ExcelProperty({"涉企涉冻"})
+    private String  involvedIssue;
 
-
-}
+}

src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintImportDto.java

@@ -92,6 +92,9 @@ public class DataPetitionComplaintImportDto {
     @ExcelProperty({"办结状态"})
     private String petitionProcessingStatus;
 
+    @ExcelProperty({"涉企涉冻"})
+    private String  involvedIssue;
+
 
 
     @ExcelIgnore

src/main/java/com/biutag/supervision/pojo/param/DataCaseVerifQueryParam.java

@@ -28,6 +28,8 @@ public class DataCaseVerifQueryParam extends BasePage {
 
     private String checkStatus; // 是否属实
 
+    private String involvedIssue;
+
 
     // 问题发现时间
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

src/main/java/com/biutag/supervision/pojo/vo/DataThreaVo.java

@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
 public class DataThreaVo {
     //线索id
     private String originId;
-    //涉及问题
+    //涉企涉冻
     private String involvedIssue;
     //投诉渠道
     private String channelForFilingComplaints;

src/main/java/com/biutag/supervision/service/DataCaseVerifService.java

@@ -41,6 +41,7 @@ public class DataCaseVerifService extends ServiceImpl<DataCaseVerifMapper, DataC
         queryWrapper.like(StrUtil.isNotBlank(queryParam.getOriginId()), DataCaseVerif::getOriginId, queryParam.getOriginId())
                 .like(StrUtil.isNotBlank(queryParam.getThingDesc()), DataCaseVerif::getThingDesc, queryParam.getThingDesc())
                 .eq(StrUtil.isNotBlank(queryParam.getCheckStatus()), DataCaseVerif::getIsReal, queryParam.getCheckStatus())
+                .eq(StrUtil.isNotBlank(queryParam.getInvolvedIssue()),DataCaseVerif::getInvolvedIssue,queryParam.getInvolvedIssue())
                 .eq(StrUtil.isNotBlank(queryParam.getDistributionState()), DataCaseVerif::getDistributionState, queryParam.getDistributionState())
                 .orderByDesc(DataCaseVerif::getCreateTime);
         if( !queryParam.getDiscoveryTime().isEmpty()){

src/main/java/com/biutag/supervision/service/DataThreadService.java

@@ -8,12 +8,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.biutag.supervision.constants.enums.ProblemSourcesEnum;
+import com.biutag.supervision.mapper.DataCaseVerifMapper;
 import com.biutag.supervision.mapper.DataThreadMapper;
 import com.biutag.supervision.pojo.Result;
-import com.biutag.supervision.pojo.entity.DataMailbox;
-import com.biutag.supervision.pojo.entity.DataMailboxBlame;
-import com.biutag.supervision.pojo.entity.DataPetitionComplaint;
-import com.biutag.supervision.pojo.entity.SupDictData;
+import com.biutag.supervision.pojo.entity.*;
 import com.biutag.supervision.pojo.param.DataPetitionComplaintQueryParam;
 import com.biutag.supervision.pojo.param.DataThreadQueryParam;
 import com.biutag.supervision.pojo.vo.DataPetitionComplaintVo;
@@ -47,6 +45,8 @@ public class DataThreadService {
     private final DataMailboxService dataMailboxService;
 
     private final SupDictDataService dictDataService;
+
+    private final DataCaseVerifService caseVerifService;
     public Result<Object> pageList(DataThreadQueryParam queryParam){
 
         //录入时间
@@ -67,7 +67,7 @@ public class DataThreadService {
                BeanUtil.copyProperties(queryParam,dataPetitionComplaintQueryParam);
                return Result.success(dataPetitionComplaintService.page(dataPetitionComplaintQueryParam));
            }
-           else{
+           else if("23".equals(queryParam.getProblemSourcesCode())){
                LambdaQueryWrapper<DataMailbox> wrapper = new LambdaQueryWrapper<DataMailbox>()
                        .eq(DataMailbox::getProblemSourcesCode, ProblemSourcesEnum.JZXX.getValue())
                        .like(StrUtil.isNotBlank(queryParam.getOriginId()), DataMailbox::getOriginId, queryParam.getOriginId())
@@ -87,6 +87,25 @@ public class DataThreadService {
                }
                return Result.success(dataMailboxService.page(Page.of(queryParam.getCurrent(), queryParam.getSize()), wrapper));
            }
+           else{
+               LambdaQueryWrapper<DataCaseVerif> wrapper = new LambdaQueryWrapper<DataCaseVerif>()
+                       .like(StrUtil.isNotBlank(queryParam.getOriginId()), DataCaseVerif::getOriginId, queryParam.getOriginId())
+                       .like(StrUtil.isNotBlank(queryParam.getThingDesc()), DataCaseVerif::getThingDesc, queryParam.getThingDesc());
+               if (queryParam.getDiscoveryTime().size() == 2) {
+                   wrapper.between(DataCaseVerif::getDiscoveryTime, queryParam.getDiscoveryTime().get(0), queryParam.getDiscoveryTime().get(1));
+               }
+               if (StrUtil.isNotBlank(queryParam.getResponderKey()) && StrUtil.isNotBlank(queryParam.getResponderValue())) {
+                   switch (queryParam.getResponderKey()) {
+                       case "name":
+                           wrapper.like(DataCaseVerif::getResponderName, queryParam.getResponderValue());
+                           break;
+                       case "phone":
+                           wrapper.like(DataCaseVerif::getResponderPhone, queryParam.getResponderValue());
+                           break;
+                   }
+               }
+               return Result.success(caseVerifService.page(Page.of(queryParam.getCurrent(), queryParam.getSize()), wrapper));
+           }
        }else{
            return Result.success(dataThreadMapper.queryPage(Page.of(queryParam.getCurrent(), queryParam.getSize()),queryParam));
        }

src/main/resources/mapper/DataThreadMapper.xml

@@ -114,6 +114,58 @@
             </if>
         </where>
         )
+        UNION ALL
+        (
+        select
+        originId,
+        involved_issue as involvedIssue,
+        problem_sources as channelForFilingComplaints,
+        discovery_time as discoveryTime,
+        responder_name as responderName,
+        responder_phone as responderPhone,
+        thing_desc as thingDesc,
+        '' as initialPetition,
+        '' as massVisits,
+        distribution_state as distributionState,
+        '' as problemSourcesCode,
+        '' as receivingLeaderName,
+        '' as petitionProcessingStatus,
+        '' as checkStatus,
+        is_real as checkStatusName,
+        create_time as crtTime,
+        '' as petitionType,
+        second_depart_name as secondDepartName,
+        third_depart_name as thirdDepartName,
+        'ajhc' as tableName
+        from
+        data_case_verif
+        <where>
+            1=1
+            <if test = "query.originId != null and query.originId != '' ">
+                and originId， like concat('%',#{query.originId,jdbcType=VARCHAR},'%')
+            </if>
+            <if test="query.involvedIssue != null and query.involvedIssue != ''">
+                and involved_issue = #{query.involvedIssue}
+            </if>
+            <if test="query.thingDesc != null and query.thingDesc != ''">
+                and thingDesc like concat('%',#{query.thingDesc,jdbcType=VARCHAR},'%')
+            </if>
+            <if test="query.responderKey != null and query.responderKey != ''">
+                <if test="query.responderKey == 'name' and query.responderValue != null  and query.responderValue != '' ">
+                    and responder_name like concat('%',#{query.responderValue,jdbcType=VARCHAR},'%')
+                </if>
+                <if test="query.responderKey == 'phone' and query.responderValue != null  and query.responderValue != '' ">
+                    and responder_phone  like concat('%',#{query.responderValue,jdbcType=VARCHAR},'%')
+                </if>
+            </if>
+            <if test="query.startCrtTime!= null and query.endCrtTime != null ">
+                and create_time between #{query.startCrtTime} and #{query.endCrtTime,jdbcType=TIMESTAMP}
+            </if>
+            <if test="query.startDiscoveryTime != null and query.startDiscoveryTime != null">
+                and discovery_time  between #{query.startDiscoveryTime} and #{query.endDiscoveryTime}
+            </if>
+        </where>
+        )
     </select>