diff --git a/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java b/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java index 6267022..3e87834 100644 --- a/src/main/java/com/biutag/supervision/controller/data/DataPetitionComplaintController.java +++ b/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(){ @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 updateWrapper =new LambdaUpdateWrapper() - .set(DataPetitionComplaint::getInvolvedIssue,specialSupervision) - .eq(DataPetitionComplaint::getOriginId,dto.getOriginId()); - if(StrUtil.isNotEmpty(dto.getOriginId()) && StrUtil.isNotEmpty(dto.getInvolvedIssue())){ - dataPetitionComplaintService.update(updateWrapper); - } + LambdaUpdateWrapper updateWrapper =new LambdaUpdateWrapper() + .set(DataPetitionComplaint::getInvolvedIssue,dto.getInvolvedIssue()) + .eq(DataPetitionComplaint::getOriginId,dto.getOriginId()); + if(StrUtil.isNotEmpty(dto.getOriginId()) && StrUtil.isNotEmpty(dto.getInvolvedIssue())){ + dataPetitionComplaintService.update(updateWrapper); } } diff --git a/src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintGjImportDto.java b/src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintGjImportDto.java index 92ba2e7..56566f7 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintGjImportDto.java +++ b/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; - -} \ No newline at end of file +} diff --git a/src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintImportDto.java b/src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintImportDto.java index 7d47789..88dd936 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/DataPetitionComplaintImportDto.java +++ b/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 diff --git a/src/main/java/com/biutag/supervision/pojo/param/DataCaseVerifQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/DataCaseVerifQueryParam.java index fd2c6c5..f53ae57 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/DataCaseVerifQueryParam.java +++ b/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") diff --git a/src/main/java/com/biutag/supervision/pojo/vo/DataThreaVo.java b/src/main/java/com/biutag/supervision/pojo/vo/DataThreaVo.java index 93b7dcc..9e1dd87 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/DataThreaVo.java +++ b/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; diff --git a/src/main/java/com/biutag/supervision/service/DataCaseVerifService.java b/src/main/java/com/biutag/supervision/service/DataCaseVerifService.java index 359135e..e057d86 100644 --- a/src/main/java/com/biutag/supervision/service/DataCaseVerifService.java +++ b/src/main/java/com/biutag/supervision/service/DataCaseVerifService.java @@ -41,6 +41,7 @@ public class DataCaseVerifService extends ServiceImpl 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 wrapper = new LambdaQueryWrapper() .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 wrapper = new LambdaQueryWrapper() + .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)); } diff --git a/src/main/resources/mapper/DataThreadMapper.xml b/src/main/resources/mapper/DataThreadMapper.xml index 9ee8c55..10ea65e 100644 --- a/src/main/resources/mapper/DataThreadMapper.xml +++ b/src/main/resources/mapper/DataThreadMapper.xml @@ -114,6 +114,58 @@ ) + 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 + + 1=1 + + and originId， like concat('%',#{query.originId,jdbcType=VARCHAR},'%') + + + and involved_issue = #{query.involvedIssue} + + + and thingDesc like concat('%',#{query.thingDesc,jdbcType=VARCHAR},'%') + + + + and responder_name like concat('%',#{query.responderValue,jdbcType=VARCHAR},'%') + + + and responder_phone like concat('%',#{query.responderValue,jdbcType=VARCHAR},'%') + + + + and create_time between #{query.startCrtTime} and #{query.endCrtTime,jdbcType=TIMESTAMP} + + + and discovery_time between #{query.startDiscoveryTime} and #{query.endDiscoveryTime} + + + ) diff --git a/src/main/resources/static/templates/公安信访投诉数据导入模板.xls b/src/main/resources/static/templates/公安信访投诉数据导入模板.xls index c3bbcbf..111c0f9 100644 Binary files a/src/main/resources/static/templates/公安信访投诉数据导入模板.xls and b/src/main/resources/static/templates/公安信访投诉数据导入模板.xls differ diff --git a/src/main/resources/static/templates/国家信访投诉数据导入模板.xls b/src/main/resources/static/templates/国家信访投诉数据导入模板.xls index cd49ddc..629d6e9 100644 Binary files a/src/main/resources/static/templates/国家信访投诉数据导入模板.xls and b/src/main/resources/static/templates/国家信访投诉数据导入模板.xls differ diff --git a/src/main/resources/static/templates/涉及问题导入模板.xlsx b/src/main/resources/static/templates/涉企涉冻导入模板.xlsx similarity index 61% rename from src/main/resources/static/templates/涉及问题导入模板.xlsx rename to src/main/resources/static/templates/涉企涉冻导入模板.xlsx index 3962d0b..aae1a52 100644 Binary files a/src/main/resources/static/templates/涉及问题导入模板.xlsx and b/src/main/resources/static/templates/涉企涉冻导入模板.xlsx differ