From c835733147e63dd58c6cc758da938aa7774cfab3 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Mon, 20 Mar 2023 18:55:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B5=E8=83=BD=E8=B4=A8?=
 =?UTF-8?q?=E9=87=8F=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IssuesServiceImpl.java       | 78 ++++++++++---------
 1 file changed, 41 insertions(+), 37 deletions(-)

diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java
index 8e212ee5b..d15420cdf 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java
@@ -34,7 +34,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
@@ -590,45 +589,50 @@ public class IssuesServiceImpl implements IssuesService {
         String report_process_status = "";
         String reportProcess = electricityQualityCheckParam.getReportProcess();
         String checkResult = electricityQualityCheckParam.getCheckResult();
-        if (DicDataEnum.CAUSE_ANALYSIS.getCode().equals(reportProcess)) {
-            if (Objects.equals("1", checkResult)) {
-                report_process_status = DicDataEnum.AUDITT.getCode();
-                report_process = DicDataEnum.PLAN_MEASURES.getCode();
-            } else {
-                report_process_status = DicDataEnum.FAIL.getCode();
-                report_process = DicDataEnum.CAUSE_ANALYSIS.getCode();
-            }
-        } else if (DicDataEnum.PLAN_MEASURES.getCode().equals(reportProcess)) {
-            if (Objects.equals("1", checkResult)) {
-                report_process_status = DicDataEnum.AUDITT.getCode();
-                report_process = DicDataEnum.ACTUAL_MEASURES.getCode();
-            } else {
-                report_process_status = DicDataEnum.FAIL.getCode();
-                report_process = DicDataEnum.PLAN_MEASURES.getCode();
-            }
-
-        } else if (DicDataEnum.ACTUAL_MEASURES.getCode().equals(reportProcess)) {
-            if (Objects.equals("1", checkResult)) {
-                report_process_status = DicDataEnum.AUDITT.getCode();
-                report_process = DicDataEnum.INSIGHTS.getCode();
-            } else {
-                report_process_status = DicDataEnum.FAIL.getCode();
-                report_process = DicDataEnum.ACTUAL_MEASURES.getCode();
-            }
-
-        } else if (DicDataEnum.INSIGHTS.getCode().equals(reportProcess)) {
-
-            if (Objects.equals("1", checkResult)) {
-                report_process_status = DicDataEnum.AUDITT.getCode();
-                report_process = DicDataEnum.ARCHIVED.getCode();
-            } else {
-                report_process_status = DicDataEnum.FAIL.getCode();
-                report_process = DicDataEnum.INSIGHTS.getCode();
-            }
+//        if (DicDataEnum.CAUSE_ANALYSIS.getCode().equals(reportProcess)) {
+//            if (Objects.equals("1", checkResult)) {
+//                report_process_status = DicDataEnum.SUCCESS.getCode();
+//                report_process = DicDataEnum.PLAN_MEASURES.getCode();
+//            } else {
+//                report_process_status = DicDataEnum.FAIL.getCode();
+//                report_process = DicDataEnum.CAUSE_ANALYSIS.getCode();
+//            }
+//        } else if (DicDataEnum.PLAN_MEASURES.getCode().equals(reportProcess)) {
+//            if (Objects.equals("1", checkResult)) {
+//                report_process_status = DicDataEnum.SUCCESS.getCode();
+//                report_process = DicDataEnum.ACTUAL_MEASURES.getCode();
+//            } else {
+//                report_process_status = DicDataEnum.FAIL.getCode();
+//                report_process = DicDataEnum.PLAN_MEASURES.getCode();
+//            }
+//
+//        } else if (DicDataEnum.ACTUAL_MEASURES.getCode().equals(reportProcess)) {
+//            if (Objects.equals("1", checkResult)) {
+//                report_process_status = DicDataEnum.AUDITT.getCode();
+//                report_process = DicDataEnum.INSIGHTS.getCode();
+//            } else {
+//                report_process_status = DicDataEnum.FAIL.getCode();
+//                report_process = DicDataEnum.ACTUAL_MEASURES.getCode();
+//            }
+//
+//        } else if (DicDataEnum.INSIGHTS.getCode().equals(reportProcess)) {
+//
+//            if (Objects.equals("1", checkResult)) {
+//                report_process_status = DicDataEnum.AUDITT.getCode();
+//                report_process = DicDataEnum.ARCHIVED.getCode();
+//            } else {
+//                report_process_status = DicDataEnum.FAIL.getCode();
+//                report_process = DicDataEnum.INSIGHTS.getCode();
+//            }
+//        }
+        if (Objects.equals ("1", checkResult)) {
+            report_process_status = DicDataEnum.SUCCESS.getCode ( );
+        } else {
+            report_process_status = DicDataEnum.FAIL.getCode ( );
         }
         UpdateWrapper<RStatElectricQualityProblemFlow> updateWrapper = new UpdateWrapper();
         updateWrapper.eq("power_quality_problem_no", electricityQualityCheckParam.getPowerQualityProblemNo());
-        updateWrapper.set("report_process", report_process);
+//        updateWrapper.set("report_process", report_process);
         updateWrapper.set("report_process_status", report_process_status);
         int i = issuesMapper.update(null, updateWrapper);
         result = insert == 1 && i == 1;