diff --git a/src/main/java/com/biutag/supervision/constants/enums/IsRectifyEnum.java b/src/main/java/com/biutag/supervision/constants/enums/IsRectifyEnum.java index 1397490..6e251f6 100644 --- a/src/main/java/com/biutag/supervision/constants/enums/IsRectifyEnum.java +++ b/src/main/java/com/biutag/supervision/constants/enums/IsRectifyEnum.java @@ -8,8 +8,12 @@ import lombok.Getter; @Getter public enum IsRectifyEnum { - NOT("0"), - YES("1"); + // 暂未整改 + NOT_YET("0"), + // 已整改 + YES("1"), + // 无法整改 + CANNOT("2"); private String value; diff --git a/src/main/java/com/biutag/supervision/controller/work/NegativeImportController.java b/src/main/java/com/biutag/supervision/controller/work/NegativeImportController.java index 7bb8830..a36460d 100644 --- a/src/main/java/com/biutag/supervision/controller/work/NegativeImportController.java +++ b/src/main/java/com/biutag/supervision/controller/work/NegativeImportController.java @@ -198,7 +198,7 @@ public class NegativeImportController { verifyData.setIsRectifyCode(IsRectifyEnum.YES.getValue()); verifyData.setRectifyDesc(item.getRectifyDesc()); } else { - verifyData.setIsRectifyCode(IsRectifyEnum.NOT.getValue()); + verifyData.setIsRectifyCode(IsRectifyEnum.NOT_YET.getValue()); } verifyData.setAccountabilityTarget("1"); verifyData.setCaseNumber(item.getCaseNumber()); 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 b4e9ef2..cbd0171 100644 --- a/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java +++ b/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java @@ -111,15 +111,23 @@ public class ApplyCompletionAction implements Action { .set(Negative::getHandleResult12337Group, null); } // 属实 - if (InspectCaseEnum.isItTure(verifyData.getCheckStatus())) { + boolean itTure = InspectCaseEnum.isItTure(checkStatus); + if (itTure) { updateWrapper .set(Negative::getIsRectifyCode, verifyData.getIsRectifyCode()) - .set(Negative::getIsRectifyName, verifyData.getIsRectifyName()) - .set(Negative::getRectifyDesc, verifyData.getRectifyDesc()) - .set(Negative::getUnrectifyReason, verifyData.getUnrectifyReason()); + .set(Negative::getIsRectifyName, verifyData.getIsRectifyName()); // 未整改 - if (IsRectifyEnum.NOT.getValue().equals(verifyData.getIsRectifyCode())) { - updateWrapper.set(Negative::getRectifyRestrictionDays, verifyData.getRectifyRestrictionDays()); + if (IsRectifyEnum.NOT_YET.getValue().equals(verifyData.getIsRectifyCode()) || IsRectifyEnum.CANNOT.getValue().equals(verifyData.getIsRectifyCode())) { + updateWrapper.set(Negative::getUnrectifyReason, verifyData.getUnrectifyReason()) + .set(Negative::getRectifyDesc, null); + if (IsRectifyEnum.NOT_YET.getValue().equals(verifyData.getIsRectifyCode())) { + updateWrapper.set(Negative::getRectifyRestrictionDays, verifyData.getRectifyRestrictionDays()); + } + } + // 未整改 + if (IsRectifyEnum.YES.getValue().equals(verifyData.getIsRectifyCode())) { + updateWrapper.set(Negative::getRectifyDesc, verifyData.getRectifyDesc()) + .set(Negative::getUnrectifyReason, null); } } // 不属实 @@ -175,7 +183,7 @@ public class ApplyCompletionAction implements Action { } // 属实 - if (InspectCaseEnum.isItTure(verifyData.getCheckStatus())) { + if (itTure) { if (CollectionUtil.isNotEmpty(item.getHandleResultCode())) { negativeBlame.setHandleResultCode(String.join(",", item.getHandleResultCode())); }