diff --git a/src/main/java/com/biutag/supervision/controller/api/plugin/CaseVerifController.java b/src/main/java/com/biutag/supervision/controller/api/plugin/CaseVerifController.java index ed3605a..d3abd40 100644 --- a/src/main/java/com/biutag/supervision/controller/api/plugin/CaseVerifController.java +++ b/src/main/java/com/biutag/supervision/controller/api/plugin/CaseVerifController.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.biutag.supervision.common.UserContextHolder; import com.biutag.supervision.constants.enums.CaseVerifSource; +import com.biutag.supervision.constants.enums.DistributionStateEnum; import com.biutag.supervision.constants.enums.InspectCaseEnum; import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.dto.plugin.*; @@ -54,11 +55,17 @@ public class CaseVerifController { caseVerif.setResponderName(body.getReporterName()); caseVerif.setResponderPhone(body.getReporterContact()); caseVerif.setThingDesc(body.getBriefCase()); + caseVerif.setDiscoveryTime(body.getComplaintTime()); + caseVerif.setHappenTime(body.getComplaintTime()); + // 来源 + caseVerif.setProblemSources(body.getCaseSource()); caseVerif.setSourceInvolveDepartName(body.getVerifiedObjectUnit()); caseVerif.setSource(CaseVerifSource.plugin.name()); caseVerif.setCreator(UserContextHolder.getCurrentUserId()); caseVerif.setCrxState("1"); - dataCaseVerifService.save(caseVerif); + caseVerif.setCreateTime(LocalDateTime.now()); + caseVerif.setDistributionState(DistributionStateEnum.UNDISTRIBUTED.getValue()); + dataCaseVerifService.saveOrUpdate(caseVerif); return Result.success(); } diff --git a/src/main/java/com/biutag/supervision/controller/sensitiveperception/ProfileDepartController.java b/src/main/java/com/biutag/supervision/controller/sensitiveperception/ProfileDepartController.java index e54d8bf..b43d28e 100644 --- a/src/main/java/com/biutag/supervision/controller/sensitiveperception/ProfileDepartController.java +++ b/src/main/java/com/biutag/supervision/controller/sensitiveperception/ProfileDepartController.java @@ -151,7 +151,7 @@ public class ProfileDepartController { Map> collect = negativeProblemRelations.stream().collect(Collectors.groupingBy(item -> item.getOneLevelContent() + " / " + item.getTwoLevelContent() + " / " + item.getThreeLevelContent())); List problemTypeBarList = collect.keySet().stream().map(key -> { return new BarItem(key, collect.get(key).size()); - }).toList(); + }).sorted(Comparator.comparing(BarItem::getValue).reversed()).toList(); profileDepart.setProblemTypeBarList(problemTypeBarList); List result = negativeScoreService.calculateDepartScore(beginTime, endTime, departId); 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 0f3e279..26f28c7 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java @@ -80,4 +80,5 @@ public class NegativeQueryParam extends BasePage { private String initialPetition; + } diff --git a/src/main/java/com/biutag/supervision/service/NegativeQueryService.java b/src/main/java/com/biutag/supervision/service/NegativeQueryService.java index 6c8fb3e..84bb700 100644 --- a/src/main/java/com/biutag/supervision/service/NegativeQueryService.java +++ b/src/main/java/com/biutag/supervision/service/NegativeQueryService.java @@ -62,6 +62,7 @@ public class NegativeQueryService { .eq(StrUtil.isNotBlank(param.getIsRectifyCode()), Negative::getIsRectifyCode, param.getIsRectifyCode()) .eq(StrUtil.isNotBlank(param.getSpecialSupervision()), Negative::getSpecialSupervision, param.getSpecialSupervision()) .like(StrUtil.isNotBlank(param.getReportNumber()), Negative::getReportNumber, param.getReportNumber()) + .like(StrUtil.isNotBlank(param.getCaseNumber()), Negative::getCaseNumber, param.getCaseNumber()) .eq(Objects.nonNull(param.getCrtDepartLevel()), Negative::getCrtDepartLevel, param.getCrtDepartLevel()); if (param.getHappenTime().size() == 2) { queryWrapper.between(Negative::getHappenTime, param.getHappenTime().get(0), param.getHappenTime().get(1));