From f575fced8b65002bbaea43405f42f99d8f36681b Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Fri, 29 Mar 2024 10:59:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=BC=BA=E5=B0=91=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mudu/controller/AcheckTaskController.java | 41 +++++++++++++------
 .../com/mudu/entity/ACheckQuatzEntity.java    |  6 +++
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/mudu/controller/AcheckTaskController.java b/src/main/java/com/mudu/controller/AcheckTaskController.java
index 6c0a017..76da8b4 100644
--- a/src/main/java/com/mudu/controller/AcheckTaskController.java
+++ b/src/main/java/com/mudu/controller/AcheckTaskController.java
@@ -183,24 +183,27 @@ public class AcheckTaskController {
                 String xcrwjcxzgxxUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase();
                 String xcrwwzUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase();
                 String yhzgxxUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase();
-                /**
-                 * 巡查任务检查项记录 a_safe_xcrwjcx
-                 */
-                saveXcrwJcx(b, xcrwjcxUuid, enterPriseId, xcrwuuid, rwzqUuid);
 
-                /**
-                 * 巡查任务隐患整改/隐患复查 a_safe_xcrwjcxzgxx
-                 */
-                saveXcrwJcxZgxx(a, b, xcrwjcxzgxxUuid, xcrwuuid, xcrwjcxUuid, rwzqUuid);
                 /**
                  * 巡查任务位置 a_safe_xcrwwz
                  */
                 saveXcrwwz(b, xcrwwzUuid, xcrwuuid, rwzqUuid);
+
                 /**
                  * 巡查风险点位置隐患 a_safe_yhzgxx
                  */
                 saveYhzgxx(list, a, b, yhzgxxUuid, xcrwuuid, enterPriseId, rwzqUuid, xcrwwzUuid);
 
+                /**
+                 * 巡查任务检查项记录 a_safe_xcrwjcx
+                 */
+                saveXcrwJcx(b, xcrwjcxUuid, yhzgxxUuid, xcrwwzUuid, enterPriseId, xcrwuuid, rwzqUuid);
+
+                /**
+                 * 巡查任务隐患整改/隐患复查 a_safe_xcrwjcxzgxx
+                 */
+                saveXcrwJcxZgxx(a, b, xcrwjcxzgxxUuid, xcrwuuid, xcrwjcxUuid, rwzqUuid);
+
             }
         }
 
@@ -246,9 +249,15 @@ public class AcheckTaskController {
         //复查是否合格
         aSafeYhzgxx.setFcsfhg(1);
         //隐患描述
-        aSafeYhzgxx.setYhms(null);
+        aSafeYhzgxx.setYhms(b.getDescription());
+        //整改结果
+        aSafeYhzgxx.setZgjg("已完成");
+        //历史逾期
+        aSafeYhzgxx.setLsyq(0);
         //整改时间
         aSafeYhzgxx.setZgsj(b.getReportDateTime());
+        //完成状态
+        aSafeYhzgxx.setWczt(1);
         //整改状态
         aSafeYhzgxx.setZgzt(1);
         //入库人员
@@ -341,7 +350,7 @@ public class AcheckTaskController {
      * @param xcrwuuid     巡查任务id
      * @param rwzqUuid     任务周期id
      */
-    private void saveXcrwJcx(ACheckQuatzEntity b, String xcrwjcxUuid, String enterPriseId, String xcrwuuid, String rwzqUuid) {
+    private void saveXcrwJcx(ACheckQuatzEntity b, String xcrwwzUuid, String yhzgxxUuid, String xcrwjcxUuid, String enterPriseId, String xcrwuuid, String rwzqUuid) {
         ASafeXcrwjcx aSafeXcrwjcx = new ASafeXcrwjcx();
         //信息编号
         aSafeXcrwjcx.setXxbh(xcrwjcxUuid);
@@ -383,8 +392,10 @@ public class AcheckTaskController {
         aSafeXcrwjcx.setFczt(1);
         //是否重点检查项
         aSafeXcrwjcx.setSfzdjcx(1);
-        //是否重点检查项
-        aSafeXcrwjcx.setSfzdjcx(1);
+        //检查要点
+        aSafeXcrwjcx.setJcyd(b.getJcydId());
+        //是否展示
+        aSafeXcrwjcx.setSfzs(1);
         //历史整改逾期
         aSafeXcrwjcx.setLszgyq(0);
         //复查历史逾期
@@ -393,6 +404,10 @@ public class AcheckTaskController {
         aSafeXcrwjcx.setFcxx(b.getReviewContent());
         //位置编号
         aSafeXcrwjcx.setWzbh(b.getWzxxbh());
+        //巡查位置编号
+        aSafeXcrwjcx.setXcwzbh(xcrwwzUuid);
+        //巡查风险点编号
+        aSafeXcrwjcx.setXcfxdbh(yhzgxxUuid);
         //任务类型
         aSafeXcrwjcx.setRwlx(3);
         //入库人员
@@ -709,6 +724,8 @@ public class AcheckTaskController {
         aSafeZcrwjl.setSfcqyxgkcs(1);
         //隐患描述
         aSafeZcrwjl.setYhms(b.getContent());
+        //记录状态
+        aSafeZcrwjl.setJlzt(1);
         //入库人员
         aSafeZcrwjl.setRkry(b.getAddUserID());
         //入库时间
diff --git a/src/main/java/com/mudu/entity/ACheckQuatzEntity.java b/src/main/java/com/mudu/entity/ACheckQuatzEntity.java
index d740a93..bcaa7ad 100644
--- a/src/main/java/com/mudu/entity/ACheckQuatzEntity.java
+++ b/src/main/java/com/mudu/entity/ACheckQuatzEntity.java
@@ -117,4 +117,10 @@ public class ACheckQuatzEntity {
     @ApiModelProperty(value = "位置名称")
     private String wzmc;
 
+    /**
+     * 检查要点
+     */
+    @ApiModelProperty(value = "检查要点")
+    private String jcydId;
+
 }