feat: 调整核查结论

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;
 

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());

src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java

@@ -111,17 +111,25 @@ 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::getIsRectifyName, verifyData.getIsRectifyName());
-                    .set(Negative::getRectifyDesc, verifyData.getRectifyDesc())
-                    .set(Negative::getUnrectifyReason, verifyData.getUnrectifyReason());
             // 未整改
-            if (IsRectifyEnum.NOT.getValue().equals(verifyData.getIsRectifyCode())) {
+            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);
+            }
+        }
         // 不属实
         else {
             updateWrapper
@@ -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()));
                     }