diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVMailViewController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVMailViewController.java index c8d8eba..3cd96e1 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVMailViewController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVMailViewController.java @@ -66,11 +66,13 @@ public class DataVMailViewController { List countryList = negativeMapper.getMailTrend(year, 21); List policeList = negativeMapper.getMailTrend(year, 22); List commissionerList = dataMailService.getCommissionerTrend(year); - List numberList = dataPetition12337Mapper.getMailTrend12337(year); + // 12337 - 已隐藏 +// List numberList = dataPetition12337Mapper.getMailTrend12337(year); JSONObject data = new JSONObject().fluentPut("countryList", countryList) .fluentPut("policeList", policeList) .fluentPut("commissionerList", commissionerList) - .fluentPut("numberList", numberList); +// .fluentPut("numberList", numberList) + ; return Result.success(data); } // endregion diff --git a/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskProblemController.java b/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskProblemController.java index 9f1243c..740fdaa 100644 --- a/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskProblemController.java +++ b/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskProblemController.java @@ -37,6 +37,7 @@ import org.springframework.web.bind.annotation.*; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -78,7 +79,13 @@ public class TaskProblemController { queryWrapper.eq(SupTaskProblem::getCreateUsername, user.getUserName()); } if(StrUtil.isNotBlank(queryParam.getActionType())){ - queryWrapper.eq(!"0".equals(queryParam.getActionType()),SupTaskProblem::getProblemState,queryParam.getActionType()); + if("1".equals(queryParam.getActionType())){ + // 待下发：筛选未分发的数据 + queryWrapper.eq(SupTaskProblem::getDistributionState, "0"); + } else if("2".equals(queryParam.getActionType())){ + // 查否：筛选查否状态的数据 + queryWrapper.eq(SupTaskProblem::getProblemState, "2"); + } } queryWrapper.orderByDesc(SupTaskProblem::getCreateTime); Page page = taskProblemService.page(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper); @@ -102,8 +109,10 @@ public class TaskProblemController { SupTaskProblem supTaskProblem = taskProblemService.getById(id); if("1".equals(supTaskProblem.getProblemState())){ supTaskProblem.setProblemState("2"); + supTaskProblem.setRejectTime(LocalDateTime.now()); // 设置查否时间 }else{ supTaskProblem.setProblemState("1"); + // 恢复时不处理 rejectTime，保留最后一次查否时间 } return Result.success(taskProblemService.updateById(supTaskProblem)); } diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java index 576e9cc..8d1cb28 100644 --- a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java @@ -311,17 +311,12 @@ public interface NegativeMapper extends BaseMapper { @Param("codes") List codes ); - @Select("select ng.* from negative ng " + - "LEFT JOIN sup_depart sd on ng.involveDepartId = sd.id " + - "LEFT JOIN sup_depart sdd on sd.pid = sdd.id " + - "LEFT JOIN sup_depart sddd on sdd.pid = sddd.id " + - "where " + - "ng.special_supervision =#{specialSupervision} " + - "and ng.crtTime >= #{beginTime} " + - "and ng.crtTime <= #{endTime} " + - "AND (sd.id =#{id} OR sdd.id=#{id} or sddd.id=#{id});" - ) - List getYellowBetNegativeList(String id, Date beginTime, Date endTime, String specialSupervision); + List getYellowBetNegativeList( + @Param("id") String id, + @Param("beginTime") Date beginTime, + @Param("endTime") Date endTime, + @Param("specialSupervision") String specialSupervision + ); diff --git a/src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionExcelDTO.java b/src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionExcelDTO.java index 5966c68..5a083b9 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionExcelDTO.java +++ b/src/main/java/com/biutag/supervision/pojo/dto/complaintCollection/ComplaintCollectionExcelDTO.java @@ -41,10 +41,14 @@ public class ComplaintCollectionExcelDTO { @ColumnWidth(20) private String responderPhone; - @ExcelProperty("被投诉机构") + @ExcelProperty("被投诉二级机构") @ColumnWidth(20) private String secondDepartName; + @ExcelProperty("被投诉三级机构") + @ColumnWidth(20) + private String thirdDepartName; + @ExcelProperty("来信内容") @ColumnWidth(20) private String thingDesc; diff --git a/src/main/java/com/biutag/supervision/pojo/entity/SupTaskProblem.java b/src/main/java/com/biutag/supervision/pojo/entity/SupTaskProblem.java index 444fe4a..4d435b6 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/SupTaskProblem.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/SupTaskProblem.java @@ -83,4 +83,8 @@ public class SupTaskProblem { @TableField("issue_user_id") private String issueUserId; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("reject_time") + private LocalDateTime rejectTime; } diff --git a/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java index 2b59138..5387f34 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java @@ -65,6 +65,12 @@ public class ComplaintCollectionQueryParam extends BasePage { @Schema(description = "被投诉二级机构Ids") private Set secondDepartIds; + @Schema(description = "被投诉三级机构Id") + private String thirdDepartId; + + @Schema(description = "被投诉三级机构Ids") + private Set thirdDepartIds; + @Schema(description = "被投诉二级机构名字") private String secondDepartName; diff --git a/src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java index a6cc988..9f6e53c 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java @@ -74,6 +74,9 @@ public class NegativeQueryParam extends BasePage { private String specialSupervision; + @Schema(description = "专项督察（多选查询）") + private List specialSupervisions; + private String reportNumber; private Integer crtDepartLevel; @@ -139,6 +142,7 @@ public class NegativeQueryParam extends BasePage { target.setProblemSourcesCode(this.problemSourcesCode == null ? null : new ArrayList<>(this.problemSourcesCode)); target.setInvolveDepartIds(this.involveDepartIds == null ? null : Set.copyOf(this.involveDepartIds)); target.setApprovalTimeoutStatus(this.approvalTimeoutStatus == null ? null : new ArrayList<>(this.approvalTimeoutStatus)); + target.setSpecialSupervisions(this.specialSupervisions == null ? null : new ArrayList<>(this.specialSupervisions)); return target; } diff --git a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java index 7686ccf..fb02c83 100644 --- a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java +++ b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java @@ -49,6 +49,9 @@ public class ComplaintCollectionPageRequest extends BasePage implements ParamChe @Schema(description = "被投诉二级机构名字") private String secondDepartName; + @Schema(description = "被投诉三级机构Id") + private String thirdDepartId; + /** * @see ComplaintCollectionHandleMethodEnum */ diff --git a/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeVo.java b/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeVo.java index 13398f0..b80359f 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeVo.java @@ -34,6 +34,10 @@ public class ExportNegativeVo { @ExcelProperty(value = {"问题基本信息","问题录入时间"}, format = "yyyy-MM-dd") private LocalDateTime crtTime; + + @ExcelProperty({"问题基本信息","下发单位"}) + private String issuingDepartName; + // 问题来源 @ExcelProperty({"问题基本信息","问题来源"}) private String problemSources; diff --git a/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java b/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java index 217fb13..022f556 100644 --- a/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java +++ b/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java @@ -63,6 +63,7 @@ public class ComplaintCollectionResourceService extends BaseDAO { setBatchLikeQuery(param.getOriginId(), param.getOriginIds(), qw, ComplaintCollection::getOriginId); setBatchLikeQuery(param.getCheckStatus(), param.getCheckStatusList(),qw, ComplaintCollection::getCheckStatus); setBatchQuery(param.getSecondDepartId(), param.getSecondDepartIds(), qw, ComplaintCollection::getSecondDepartId); + setBatchQuery(param.getThirdDepartId(), param.getThirdDepartIds(), qw, ComplaintCollection::getThirdDepartId); if (CollectionUtil.size(param.getDiscoveryTimeList()) == 2 && param.getDiscoveryTimeList().get(0) != null && param.getDiscoveryTimeList().get(1) != null) { diff --git a/src/main/java/com/biutag/supervision/service/BusinessDepartService.java b/src/main/java/com/biutag/supervision/service/BusinessDepartService.java index c9f9f78..7723b42 100644 --- a/src/main/java/com/biutag/supervision/service/BusinessDepartService.java +++ b/src/main/java/com/biutag/supervision/service/BusinessDepartService.java @@ -327,8 +327,8 @@ public class BusinessDepartService extends ServiceImpl selectJJDList(List happenTime) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.between("cjsj", happenTime.get(0), happenTime.get(1)); - queryWrapper.notLikeRight("jqxzdm", "11"); // 其他业务 - queryWrapper.notLikeRight("jqxzdm", "99"); // 无效、重复报警等 +// queryWrapper.notLikeRight("jqxzdm", "11"); // 其他业务 +// queryWrapper.notLikeRight("jqxzdm", "99"); // 无效、重复报警等 // queryWrapper.eq("jjlxdm", "01"); queryWrapper.groupBy("DATE(cjsj)", "gxdwdm", "gxdwmc"); return gBaseJJDMapper.selectJJDList(queryWrapper); diff --git a/src/main/java/com/biutag/supervision/service/DataMailService.java b/src/main/java/com/biutag/supervision/service/DataMailService.java index e1e0509..404e1d9 100644 --- a/src/main/java/com/biutag/supervision/service/DataMailService.java +++ b/src/main/java/com/biutag/supervision/service/DataMailService.java @@ -42,7 +42,8 @@ public class DataMailService extends ServiceImpl queryWrapper12337 = new QueryWrapper<>(); - queryWrapper12337.between("discover_time", beginTime, endTime); - Long mail12337 = dataPetition12337Mapper.selectCount(queryWrapper12337); + // 12337 - 已隐藏 +// QueryWrapper queryWrapper12337 = new QueryWrapper<>(); +// queryWrapper12337.between("discover_time", beginTime, endTime); +// Long mail12337 = dataPetition12337Mapper.selectCount(queryWrapper12337); // 局长信箱 QueryWrapper mailQueryWrapper = new QueryWrapper<>(); @@ -75,7 +76,7 @@ public class DataMailService extends ServiceImpl queryWrapper12337 = new QueryWrapper<>(); - Long total12337 = dataPetition12337Mapper.selectCount(queryWrapper12337); + // 12337信访 - 已隐藏 +// QueryWrapper queryWrapper12337 = new QueryWrapper<>(); +// Long total12337 = dataPetition12337Mapper.selectCount(queryWrapper12337); // 初访 QueryWrapper firstQueryWrapper = new QueryWrapper<>(); firstQueryWrapper.eq("initial_petition", 1); @@ -232,8 +232,8 @@ public class DataPetitionComplaintService extends ServiceImpl { + // 多选查询：specialSupervision字段包含任一选中的值（逗号分隔存储） + for (int i = 0; i < param.getSpecialSupervisions().size(); i++) { + final String code = param.getSpecialSupervisions().get(i); + if (i == 0) { + qw.apply("FIND_IN_SET({0}, special_supervision) > 0", code); + } else { + qw.or().apply("FIND_IN_SET({0}, special_supervision) > 0", code); + } + } + }) .eq(StrUtil.isNotBlank(param.getSpecialSupervision()), Negative::getSpecialSupervision, param.getSpecialSupervision()) // 通报期数 .like(StrUtil.isNotBlank(param.getReportNumber()), Negative::getReportNumber, param.getReportNumber()) @@ -227,6 +240,10 @@ public class NegativeQueryService { // 最后更新时间 queryWrapper.orderByDesc(Negative::getUpdTime); Page page = negativeService.page(Page.of(param.getCurrent(), param.getSize()), queryWrapper); + Map allDepartsMap = departService.list( + new LambdaQueryWrapper() + .in(SupDepart::getLevel, List.of(DepartLevelEnum.SECOND.getValue(), DepartLevelEnum.THREE.getValue())) + ).stream().collect(Collectors.toMap(SupDepart::getId, d -> d, (a, b) -> a)); long l = System.currentTimeMillis(); List list = page.getRecords().stream().map(item -> { NegativeQueryVo vo = new NegativeQueryVo(); @@ -234,6 +251,7 @@ public class NegativeQueryService { if (Objects.nonNull(item.getFirstDistributeTime()) && !ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus())) { vo.setRemainingDuration(TimeUtil.getRemainingDuration(item.getFirstDistributeTime(), item.getMaxSignDuration(), item.getMaxHandleDuration(), item.getExtensionDays(), item.getFlowKey())); } + vo.setIssuingDepartName(buildIssuingDepartName(item.getIssuingDepartId(), item.getIssuingDepartName(), allDepartsMap)); return vo; }).toList(); System.out.printf("耗时：%sms", System.currentTimeMillis() - l); @@ -257,4 +275,28 @@ public class NegativeQueryService { } } + /** + * 构建下发单位名称 + * 3级单位拼接上级2级单位名称，2级单位保持原名 + * @param issuingDepartId 下发单位ID + * @param originalName 原名称 + * @param allDepartsMap 所有单位Map + * @return 拼接后的名称 + */ + private String buildIssuingDepartName(String issuingDepartId, String originalName, Map allDepartsMap) { + if (StrUtil.isBlank(issuingDepartId) || StrUtil.isBlank(originalName)) { + return originalName; + } + SupDepart depart = allDepartsMap.get(issuingDepartId); + if (depart == null || !DepartLevelEnum.THREE.getValue().equals(depart.getLevel())) { + // 非3级单位，返回原名 + return originalName; + } + SupDepart parent = allDepartsMap.get(depart.getPid()); + if (parent != null) { + return parent.getShortName() + "/" + originalName; + } + return originalName; + } + } diff --git a/src/main/java/com/biutag/supervision/service/NegativeTaskService.java b/src/main/java/com/biutag/supervision/service/NegativeTaskService.java index 9685c51..5c5a94d 100644 --- a/src/main/java/com/biutag/supervision/service/NegativeTaskService.java +++ b/src/main/java/com/biutag/supervision/service/NegativeTaskService.java @@ -143,9 +143,12 @@ public class NegativeTaskService extends ServiceImpldict.getDictValue().equals(vo.getSpecialSupervision())).findFirst().map(SupDictData::getDictLabel).orElse(""); + //专项督察（支持多选逗号分隔） + if(StrUtil.isNotBlank(vo.getSpecialSupervision())){ + String specialSupervision = Arrays.stream(vo.getSpecialSupervision().split(",")) + .map(val -> specialSupervisionDict.stream().filter(dict -> dict.getDictValue().equals(val)).findFirst().map(SupDictData::getDictLabel).orElse("")) + .filter(StrUtil::isNotBlank) + .collect(Collectors.joining("、")); vo.setSpecialSupervision(specialSupervision); } diff --git a/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java b/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java index e2e9832..3024819 100644 --- a/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java @@ -200,15 +200,10 @@ public class DatavServiceImpl implements DatavService { mailQueryWrapper.between("mail_time", request.getBeginTime(), request.getEndTime()); long jzxxCount = mailMapper.selectCount(mailQueryWrapper); - // 12337 -// NegativeQueryParam xf12337Param = new NegativeQueryParam(); -// xf12337Param.setCrtTime(dates); -// xf12337Param.setProblemSourcesCode(Collections.singletonList(ProblemSourcesEnum.XF12337.getValue())); -// long xf12337Count = negativeResourceService.count(xf12337Param); - - QueryWrapper queryWrapper12337 = new QueryWrapper<>(); - queryWrapper12337.between("discover_time", request.getBeginTime(), request.getEndTime()); - long xf12337Count = dataPetition12337Mapper.selectCount(queryWrapper12337); + // 12337 - 已隐藏 +// QueryWrapper queryWrapper12337 = new QueryWrapper<>(); +// queryWrapper12337.between("discover_time", request.getBeginTime(), request.getEndTime()); +// long xf12337Count = dataPetition12337Mapper.selectCount(queryWrapper12337); // 国家信访 @@ -239,7 +234,7 @@ public class DatavServiceImpl implements DatavService { overview.setNumSupervisionPro(szdcCount); overview.setCaseVerificationPro(ajhcCount); overview.setMailboxNumber(jzxxCount); - overview.setComplaintPro(xf12337Count + gjxfCount + gabxfCount); + overview.setComplaintPro(gjxfCount + gabxfCount); // 隐藏12337: xf12337Count + overview.setAuditPro(sjxmCount); overview.calcTotal(); JSONObject data = new JSONObject().fluentPut("overview", overview); @@ -285,14 +280,14 @@ public class DatavServiceImpl implements DatavService { // 交办案件数 List jbNegatvieList = negatives.stream().filter(one -> proCode.contains(one.getProblemSourcesCode())).toList(); long caseVerificationProCount = dataCaseVerifs.size() + jbNegatvieList.size(); - // 12337 - QueryWrapper queryWrapper12337 = new QueryWrapper<>(); - queryWrapper12337.between("discover_time", request.getBeginTime(), request.getEndTime()); - queryWrapper12337.and(wrapper -> wrapper - .in("third_depart_id", allDepartIds) - .or() - .in("second_depart_id", allDepartIds)); - long xf12337Count = dataPetition12337Mapper.selectCount(queryWrapper12337); + // 12337 - 已隐藏 +// QueryWrapper queryWrapper12337 = new QueryWrapper<>(); +// queryWrapper12337.between("discover_time", request.getBeginTime(), request.getEndTime()); +// queryWrapper12337.and(wrapper -> wrapper +// .in("third_depart_id", allDepartIds) +// .or() +// .in("second_depart_id", allDepartIds)); +// long xf12337Count = dataPetition12337Mapper.selectCount(queryWrapper12337); // 国家信访 DataPetitionComplaintQueryParam countryParam = new DataPetitionComplaintQueryParam(); countryParam.setCreateTime(dates); @@ -338,7 +333,7 @@ public class DatavServiceImpl implements DatavService { globalMapIconVo.setSupervisionPro(supervisionProCount); globalMapIconVo.setNumSupervisionPro(numSupervisionProCount); globalMapIconVo.setCaseVerificationPro(caseVerificationProCount); - globalMapIconVo.setComplaintPro(xf12337Count + countryMail + policeMail); + globalMapIconVo.setComplaintPro(countryMail + policeMail); // 隐藏12337: + xf12337Count globalMapIconVo.setAuditPro((long) (reportProjects.size()+dataAuditList.size())); globalMapIconVo.setMailboxNumber(mailCount); globalMapIconVo.calcTotal(); @@ -978,10 +973,10 @@ public class DatavServiceImpl implements DatavService { policeQueryWrapper.between("create_time", request.getBeginTime(), request.getEndTime()); Long policeMail = dataPetitionComplaintMapper.selectCount(policeQueryWrapper); - // 12337 - QueryWrapper queryWrapper12337 = new QueryWrapper<>(); - queryWrapper12337.between("discover_time", request.getBeginTime(), request.getEndTime()); - Long mail12337 = dataPetition12337Mapper.selectCount(queryWrapper12337); + // 12337 - 已隐藏 +// QueryWrapper queryWrapper12337 = new QueryWrapper<>(); +// queryWrapper12337.between("discover_time", request.getBeginTime(), request.getEndTime()); +// Long mail12337 = dataPetition12337Mapper.selectCount(queryWrapper12337); // 局长信箱 QueryWrapper mailQueryWrapper = new QueryWrapper<>(); @@ -993,9 +988,10 @@ public class DatavServiceImpl implements DatavService { MailOverviewVo overview = new MailOverviewVo(); overview.setCountryMail(countryMail); overview.setPoliceMail(policeMail); - overview.setNumberMail(mail12337); +// overview.setNumberMail(mail12337); // 已隐藏 overview.setManageMail(mailCount); - overview.setTotalMail(overview.getCountryMail() + overview.getPoliceMail() + overview.getNumberMail()); + // 只计算国家信访+公安部信访+局长信箱 + overview.setTotalMail(overview.getCountryMail() + overview.getPoliceMail() + overview.getManageMail()); JSONObject data = new JSONObject().fluentPut("overview", overview); return Result.success(data); } @@ -1023,8 +1019,8 @@ public class DatavServiceImpl implements DatavService { Long countryTotal = dataPetitionComplaintMapper.selectMailBySourceCode(beginTime, endTime, GJXFPT.getValue(), departId); // 公安信访 Long policeTotal = dataPetitionComplaintMapper.selectMailBySourceCode(beginTime, endTime, GABXF.getValue(), departId); - // 12337 - Long numTotal = dataPetition12337Service.count(new LambdaQueryWrapper().between(DataPetition12337::getDiscoverTime, beginTime, endTime).eq(DataPetition12337::getSecondDepartId, departId)); + // 12337 - 已隐藏 +// Long numTotal = dataPetition12337Service.count(new LambdaQueryWrapper().between(DataPetition12337::getDiscoverTime, beginTime, endTime).eq(DataPetition12337::getSecondDepartId, departId)); // 局长信箱 QueryWrapper subOneMailQueryWrapper = new QueryWrapper<>(); String exDepartId = supExternalDepartMapper.getExIdByInId(departId.toString(), EX_SOURCE); @@ -1032,16 +1028,16 @@ public class DatavServiceImpl implements DatavService { subOneMailQueryWrapper.eq("second_dept_id", exDepartId); subOneMailQueryWrapper.between("create_time", beginTime, endTime); Long commissionerTotal = mailMapper.selectCount(subOneMailQueryWrapper); - // 总数 - Long total = countryTotal + policeTotal + numTotal; + // 总数 - 已隐藏12337 + Long total = countryTotal + policeTotal + commissionerTotal; //国家信访 re.setCountryTotal(countryTotal.toString()); //公安部信访 re.setPoliceTotal(policeTotal.toString()); //局长信箱 re.setCommissionerTotal(commissionerTotal.toString()); - //12337信访 - re.setNumTotal(numTotal.toString()); + //12337信访 - 已隐藏 +// re.setNumTotal(numTotal.toString()); re.setTotal(total.toString()); } JSONObject data = new JSONObject().fluentPut("mailMapIconList", res); diff --git a/src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java b/src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java index b7cf566..8f801f8 100644 --- a/src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java @@ -233,14 +233,14 @@ public class SubDatavServiceImpl implements SubDatavService { long mailCount = mailMapper.selectCount(mailQueryWrapper); - // 12337 - QueryWrapper queryWrapper12337 = new QueryWrapper<>(); - queryWrapper12337.between("discover_time", request.getBeginTime(), request.getEndTime()); - queryWrapper12337.and(wrapper -> wrapper - .in("third_depart_id", allDepartIds) - .or() - .in("second_depart_id", allDepartIds)); - long xf12337Count = dataPetition12337Mapper.selectCount(queryWrapper12337); + // 12337 - 已隐藏 +// QueryWrapper queryWrapper12337 = new QueryWrapper<>(); +// queryWrapper12337.between("discover_time", request.getBeginTime(), request.getEndTime()); +// queryWrapper12337.and(wrapper -> wrapper +// .in("third_depart_id", allDepartIds) +// .or() +// .in("second_depart_id", allDepartIds)); +// long xf12337Count = dataPetition12337Mapper.selectCount(queryWrapper12337); // 国家信访 @@ -275,7 +275,7 @@ public class SubDatavServiceImpl implements SubDatavService { overview.setNumSupervisionPro(szdcCount); overview.setCaseVerificationPro(ajhcCount); overview.setMailboxNumber(mailCount); - overview.setComplaintPro(xf12337Count + gjxfCount + gabxfCount); + overview.setComplaintPro(gjxfCount + gabxfCount); // 隐藏12337: xf12337Count + overview.setAuditPro(sjxmCount); overview.calcTotal(); JSONObject data = new JSONObject().fluentPut("overview", overview); @@ -319,12 +319,12 @@ public class SubDatavServiceImpl implements SubDatavService { List jbNegatvieList = negatives.stream().filter(one -> ldjbCode.contains(one.getProblemSourcesCode())).toList(); long caseVerificationProCount = dataCaseVerifs + jbNegatvieList.size(); - // 12337 - NegativeQueryParam xf12337Param = new NegativeQueryParam(); - xf12337Param.setCrtTime(dates); - xf12337Param.setInvolveDepartIds(Set.of(childDepartId)); - xf12337Param.setProblemSourcesCode(Collections.singletonList(ProblemSourcesEnum.XF12337.getValue())); - long xf12337Count = negativeResourceService.count(xf12337Param); + // 12337 - 已隐藏 +// NegativeQueryParam xf12337Param = new NegativeQueryParam(); +// xf12337Param.setCrtTime(dates); +// xf12337Param.setInvolveDepartIds(Set.of(childDepartId)); +// xf12337Param.setProblemSourcesCode(Collections.singletonList(ProblemSourcesEnum.XF12337.getValue())); +// long xf12337Count = negativeResourceService.count(xf12337Param); // 国家信访 DataPetitionComplaintQueryParam countryParam = new DataPetitionComplaintQueryParam(); @@ -372,7 +372,8 @@ public class SubDatavServiceImpl implements SubDatavService { globalMapIconVo.setSupervisionPro(supervisionProCount); globalMapIconVo.setNumSupervisionPro(numSupervisionProCount); globalMapIconVo.setCaseVerificationPro(caseVerificationProCount); - globalMapIconVo.setComplaintPro(xf12337Count + countryMail + policeMail); + // 隐藏12337: xf12337Count + countryMail + policeMail + globalMapIconVo.setComplaintPro(countryMail + policeMail); globalMapIconVo.setAuditPro(sjxmCount); globalMapIconVo.setMailboxNumber(mailCount); globalMapIconVo.setTalkPro(0L); @@ -1010,8 +1011,8 @@ public class SubDatavServiceImpl implements SubDatavService { Long countryTotal = dataPetitionComplaintMapper.selectMailBySourceCode(beginTime, endTime, GJXFPT.getValue(), departId); // 公安信访 Long policeTotal = dataPetitionComplaintMapper.selectMailBySourceCode(beginTime, endTime, GABXF.getValue(), departId); - // 12337 - Long numTotal = dataPetition12337Service.count(new LambdaQueryWrapper().between(DataPetition12337::getDiscoverTime, beginTime, endTime).eq(DataPetition12337::getSecondDepartId, departId)); + // 12337 - 已隐藏 +// Long numTotal = dataPetition12337Service.count(new LambdaQueryWrapper().between(DataPetition12337::getDiscoverTime, beginTime, endTime).eq(DataPetition12337::getSecondDepartId, departId)); // 局长信箱 QueryWrapper subOneMailQueryWrapper = new QueryWrapper<>(); String exDepartId = supExternalDepartMapper.getExIdByInId(departId.toString(), "局长信箱"); @@ -1019,16 +1020,16 @@ public class SubDatavServiceImpl implements SubDatavService { subOneMailQueryWrapper.eq("second_dept_id", exDepartId); subOneMailQueryWrapper.between("create_time", beginTime, endTime); Long commissionerTotal = mailMapper.selectCount(subOneMailQueryWrapper); - // 总数 - Long total = countryTotal + policeTotal + numTotal; + // 总数 - 已隐藏12337 + Long total = countryTotal + policeTotal + commissionerTotal; //国家信访 overview.setCountryMail(countryTotal); //公安部信访 overview.setPoliceMail(policeTotal); //局长信箱 overview.setManageMail(commissionerTotal); - //12337信访 - overview.setNumberMail(numTotal); + //12337信访 - 已隐藏 +// overview.setNumberMail(numTotal); overview.setTotalMail(total); // overview.setCountryMail(120L); // 国家信访 // overview.setPoliceMail(45L); // 公安部信访 @@ -1061,11 +1062,11 @@ public class SubDatavServiceImpl implements SubDatavService { Long countryTotal = dataPetitionComplaintMapper.selectPoliceMailBySourceCode(beginTime, endTime, GJXFPT.getValue(), policeDepartId); // 公安 Long policeTotal = dataPetitionComplaintMapper.selectPoliceMailBySourceCode(beginTime, endTime, GABXF.getValue(), policeDepartId); - // 12337 数据 - LambdaQueryWrapper dataPetition12337LambdaQueryWrapper = new LambdaQueryWrapper<>(); - dataPetition12337LambdaQueryWrapper.between(DataPetition12337::getDiscoverTime, beginTime, endTime); - dataPetition12337LambdaQueryWrapper.eq(DataPetition12337::getThirdDepartId, re.getDepartId()); - Long numTotal = dataPetition12337Service.count(dataPetition12337LambdaQueryWrapper); + // 12337 数据 - 已隐藏 +// LambdaQueryWrapper dataPetition12337LambdaQueryWrapper = new LambdaQueryWrapper<>(); +// dataPetition12337LambdaQueryWrapper.between(DataPetition12337::getDiscoverTime, beginTime, endTime); +// dataPetition12337LambdaQueryWrapper.eq(DataPetition12337::getThirdDepartId, re.getDepartId()); +// Long numTotal = dataPetition12337Service.count(dataPetition12337LambdaQueryWrapper); // 局长信箱 String exDepartId = supExternalDepartMapper.getExIdByInId(policeDepartId, EX_SOURCE); Long manageMail = 0L; @@ -1078,13 +1079,14 @@ public class SubDatavServiceImpl implements SubDatavService { } long country = countryTotal == null ? 0L : countryTotal; long police = policeTotal == null ? 0L : policeTotal; - long num = numTotal == null ? 0L : numTotal; + // 12337 - 已隐藏: long num = numTotal == null ? 0L : numTotal; long manage = manageMail == null ? 0L : manageMail; - Long total = country + police + num; + // 已隐藏12337: Long total = country + police + num; + Long total = country + police + manage; re.setCountryTotal(String.valueOf(country)); re.setPoliceTotal(String.valueOf(police)); re.setCommissionerTotal(String.valueOf(manage)); - re.setNumTotal(String.valueOf(num)); + // 已隐藏: re.setNumTotal(String.valueOf(num)); re.setTotal(total.toString()); } JSONObject data = new JSONObject().fluentPut("mailMapIconList", res); diff --git a/src/main/resources/mapper/NegativeMapper.xml b/src/main/resources/mapper/NegativeMapper.xml new file mode 100644 index 0000000..4b10cf7 --- /dev/null +++ b/src/main/resources/mapper/NegativeMapper.xml @@ -0,0 +1,31 @@ + + + + + + +