diff --git a/sql/20251216.sql b/sql/20251216.sql new file mode 100644 index 0000000..f38eb4e --- /dev/null +++ b/sql/20251216.sql @@ -0,0 +1,4 @@ +update negative set check_status_code = checkStatus where checkStatus in (1, 2); +update negative set check_status_code = '5' where checkStatus = 3; +update negative set check_status_code = '5' where checkStatus = 4; +update negative set checkStatus = '3' where checkStatus = 4; \ No newline at end of file diff --git a/src/main/java/com/biutag/supervision/constants/enums/CheckStatusEnum.java b/src/main/java/com/biutag/supervision/constants/enums/CheckStatusEnum.java new file mode 100644 index 0000000..666129d --- /dev/null +++ b/src/main/java/com/biutag/supervision/constants/enums/CheckStatusEnum.java @@ -0,0 +1,23 @@ +package com.biutag.supervision.constants.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum CheckStatusEnum { + + // 属实 + TRUE("1", "属实"), + // 部分属实 + PARTIALLY_TRUE("2", "部分属实"), + // 不属实 + QTFT("3", "不属实，但发现存在其他问题"), + WFCS("4", "现有证据暂时无法查实"), + FALSE("5", "不属实"); + + private String value; + + private String label; + +} 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 b4a48a5..7816790 100644 --- a/src/main/java/com/biutag/supervision/controller/sensitiveperception/ProfileDepartController.java +++ b/src/main/java/com/biutag/supervision/controller/sensitiveperception/ProfileDepartController.java @@ -96,9 +96,9 @@ public class ProfileDepartController { List negativeIds = list.stream().map(NegativeScoreDepart::getNegativeId).toList(); SupDepartPoliceSize policeSize = departPoliceSizeService.getById(departId); - if(ObjectUtil.isNotEmpty(policeSize)){ - profileDepart.getDepartInfo().setPoliceSize(policeSize.getPoliceSize() == null?policeSize.getPoliceSize():0L); - profileDepart.getDepartInfo().setAuxSize(policeSize.getAuxSize() == null?policeSize.getAuxSize():0L); + if(Objects.nonNull(policeSize)){ + profileDepart.getDepartInfo().setPoliceSize(policeSize.getPoliceSize()); + profileDepart.getDepartInfo().setAuxSize(policeSize.getAuxSize()); } if (negativeIds.isEmpty()) { diff --git a/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java b/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java index b7f3d32..b4e9ef2 100644 --- a/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java +++ b/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java @@ -14,7 +14,6 @@ import com.biutag.supervision.pojo.entity.*; import com.biutag.supervision.service.*; import com.biutag.supervision.util.JSON; import com.biutag.supervision.util.TimeUtil; -import jakarta.validation.Validator; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -74,11 +73,20 @@ public class ApplyCompletionAction implements Action { public void updateNegative(Negative negative, VerifyData verifyData) { LocalDateTime now = LocalDateTime.now(); + String checkStatus = null; + if (CheckStatusEnum.TRUE.getLabel().equals(verifyData.getCheckStatusCode())) { + checkStatus = "1"; + } else if (CheckStatusEnum.PARTIALLY_TRUE.getLabel().equals(verifyData.getCheckStatusCode()) || CheckStatusEnum.QTFT.getLabel().equals(verifyData.getCheckStatusCode())) { + checkStatus = "2"; + } else if (CheckStatusEnum.WFCS.getLabel().equals(verifyData.getCheckStatusCode()) || CheckStatusEnum.FALSE.getLabel().equals(verifyData.getCheckStatusCode())) { + checkStatus = "3"; + } LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper() .eq(Negative::getId, negative.getId()) .set(Negative::getUpdTime, now) - .set(Negative::getCheckStatus, verifyData.getCheckStatus()) + .set(Negative::getCheckStatus, checkStatus) .set(Negative::getCheckStatusName, verifyData.getCheckStatusName()) + .set(Negative::getCheckStatusCode, verifyData.getCheckStatusCode()) .set(Negative::getCheckStatusDesc, verifyData.getCheckStatusDesc()) .set(Negative::getAccountabilityTarget, verifyData.getAccountabilityTarget()) .set(Negative::getCaseNumber, verifyData.getCaseNumber()) diff --git a/src/main/java/com/biutag/supervision/mapper/DataCaseVerifMapper.java b/src/main/java/com/biutag/supervision/mapper/DataCaseVerifMapper.java index 315cc10..d4de279 100644 --- a/src/main/java/com/biutag/supervision/mapper/DataCaseVerifMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/DataCaseVerifMapper.java @@ -31,17 +31,17 @@ public interface DataCaseVerifMapper extends BaseMapper { @Select("SELECT npr.threeLevelContent AS `name`, count(*) AS `value` " + "FROM negative ng " + "INNER JOIN negative_problem_relation npr ON ng.id=npr.negativeId " + - "WHERE ng.checkStatus <>3 " + + "WHERE ng.checkStatus in (1, 2) " + "AND crtTime BETWEEN #{beginTime} AND #{endTime} " + "AND ng.problemSourcesCode IN (17, 18, 19, 20) " + "AND businessTypeCode = #{businessId} " + "GROUP BY threeLevelContent ") List getCaseProblemProperty(Date beginTime, Date endTime, Integer businessId); - -/** - * 案件问题性质 - * */ + /** + * 案件问题性质 + * + */ @Select(" SELECT " + " twoLevelContent as name, " + " COUNT(*) as value " + diff --git a/src/main/java/com/biutag/supervision/pojo/domain/NegativeVo.java b/src/main/java/com/biutag/supervision/pojo/domain/NegativeVo.java index d4f110d..c4d3d61 100644 --- a/src/main/java/com/biutag/supervision/pojo/domain/NegativeVo.java +++ b/src/main/java/com/biutag/supervision/pojo/domain/NegativeVo.java @@ -111,6 +111,8 @@ public class NegativeVo { // 核查情况 private String checkStatus; + private String checkStatusCode; + // 核查情况 private String checkStatusName; diff --git a/src/main/java/com/biutag/supervision/pojo/dto/flow/VerifyData.java b/src/main/java/com/biutag/supervision/pojo/dto/flow/VerifyData.java index 2f1bd24..e390262 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/flow/VerifyData.java +++ b/src/main/java/com/biutag/supervision/pojo/dto/flow/VerifyData.java @@ -15,13 +15,16 @@ import java.util.List; public class VerifyData { // 核查情况 - @NotBlank private String checkStatus; - // 核查情况 + // 核查结论 @NotBlank private String checkStatusName; + // 核查结论 + @NotBlank + private String checkStatusCode; + // 是否整改 @NotBlank private String isRectifyCode; diff --git a/src/main/java/com/biutag/supervision/pojo/entity/Negative.java b/src/main/java/com/biutag/supervision/pojo/entity/Negative.java index 0957198..17aa70f 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/Negative.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/Negative.java @@ -105,6 +105,8 @@ public class Negative { @TableField("checkName") private String checkName; + + // 审核人身份证 @TableField("checkIdCode") private String checkIdCode; @@ -146,6 +148,11 @@ public class Negative { @TableField("checkStatusName") private String checkStatusName; + // 核查结论 + @TableField("check_status_code") + private String checkStatusCode; + + // 完善状态 0 -- 待完善 1 -- 已完善 @TableField("completeStatus") private String completeStatus; 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 e0c4066..a4c5e64 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java @@ -45,6 +45,8 @@ public class NegativeQueryParam extends BasePage { private List checkStatus; + private List checkStatusCode; + private String isRectifyCode; 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 9a77b77..d527fc4 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/ExportNegativeVo.java @@ -90,7 +90,7 @@ public class ExportNegativeVo { // 核查情况 - @ExcelProperty({"核办情况","核查情况（是否属实）"}) + @ExcelProperty({"核办情况","核查结论（是否属实）"}) private String checkStatusName; // 核查情况 diff --git a/src/main/java/com/biutag/supervision/service/NegativeQueryService.java b/src/main/java/com/biutag/supervision/service/NegativeQueryService.java index 3d8eb48..681d595 100644 --- a/src/main/java/com/biutag/supervision/service/NegativeQueryService.java +++ b/src/main/java/com/biutag/supervision/service/NegativeQueryService.java @@ -78,6 +78,8 @@ public class NegativeQueryService { .like(StrUtil.isNotBlank(param.getReportNumber()), Negative::getReportNumber, param.getReportNumber()) // 是否属实 .in(CollectionUtil.isNotEmpty(param.getCheckStatus()), Negative::getCheckStatus, param.getCheckStatus()) + // 核查结论 + .in(CollectionUtil.isNotEmpty(param.getCheckStatusCode()), Negative::getCheckStatusCode, param.getCheckStatusCode()) // 是否整改 .eq(StrUtil.isNotBlank(param.getIsRectifyCode()), Negative::getIsRectifyCode, param.getIsRectifyCode()) // 审批流程 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c5bce62..4b3b7df 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -28,12 +28,12 @@ mybatis-plus: mapper-locations: classpath*:mapper/*Mapper.xml fdfs: - soTimeout: 1500 # socket连接超时时长 - connectTimeout: 600 # 连接tracker服务器超时时长 + soTimeout: 60000 # socket连接超时时长 + connectTimeout: 5000 # 连接tracker服务器超时时长 pool: #从池中借出的对象的最大数目（配置为-1表示不限制） - max-total: -1 + max-total: 100 #获取连接时的最大等待毫秒数(默认配置为5秒) max-wait-millis: 5000 #每个key最大连接数 diff --git a/src/main/resources/static/templates/审计监督问题批量导入模板.xlsx b/src/main/resources/static/templates/审计监督问题批量导入模板.xlsx index 81d1177..3b319c6 100644 Binary files a/src/main/resources/static/templates/审计监督问题批量导入模板.xlsx and b/src/main/resources/static/templates/审计监督问题批量导入模板.xlsx differ