From a9f685107fbbb4c6e81a65684bb672314fa8de1f Mon Sep 17 00:00:00 2001
From: zhuyulei <1843199800@qq.com>
Date: Wed, 20 Mar 2024 10:45:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=8C=87=E6=A0=87=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/kms/statistics/domain/BsSgcJsjdStatisticsFwzb.java | 2 ++
 .../java/com/kms/statistics/domain/BsSgcJsjdStatisticsJszb.java | 1 +
 .../java/com/kms/statistics/domain/BsSgcJsjdStatisticsZhzb.java | 1 +
 3 files changed, 4 insertions(+)

diff --git a/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdStatisticsFwzb.java b/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdStatisticsFwzb.java
index c330e262..ed612dce 100644
--- a/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdStatisticsFwzb.java
+++ b/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdStatisticsFwzb.java
@@ -62,4 +62,6 @@ public class BsSgcJsjdStatisticsFwzb extends BaseEntity
 
     private String status;
 
+    private String attachment;
+
 }
diff --git a/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdStatisticsJszb.java b/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdStatisticsJszb.java
index b7c7ea70..15e52a5d 100644
--- a/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdStatisticsJszb.java
+++ b/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdStatisticsJszb.java
@@ -61,5 +61,6 @@ public class BsSgcJsjdStatisticsJszb extends BaseEntity
     private String owerDept;
 
     private String status;
+    private String attachment;
 
 }
diff --git a/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdStatisticsZhzb.java b/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdStatisticsZhzb.java
index c95f8215..498f72f4 100644
--- a/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdStatisticsZhzb.java
+++ b/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdStatisticsZhzb.java
@@ -61,5 +61,6 @@ public class BsSgcJsjdStatisticsZhzb extends BaseEntity
     private String owerDept;
 
     private String status;
+    private String attachment;
 
 }

From bbefd0bc34bb9d68855eb0dc9fc6ed3cbab41a56 Mon Sep 17 00:00:00 2001
From: zhuyulei <1843199800@qq.com>
Date: Wed, 20 Mar 2024 16:10:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=8C=87=E6=A0=87=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BsSgcJsjdWarnResultHandleController.java       | 14 +++++++++++++-
 .../kms/warn/domain/BsSgcJsjdWarnResultHandle.java | 13 ++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultHandleController.java b/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultHandleController.java
index c220ecd1..3fbde761 100644
--- a/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultHandleController.java
+++ b/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultHandleController.java
@@ -2,6 +2,7 @@ package com.kms.warn.controller;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 
 import com.jianwei.common.core.controller.BaseController;
 import com.jianwei.common.core.domain.SearchParam;
@@ -109,7 +110,18 @@ public class BsSgcJsjdWarnResultHandleController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody BsSgcJsjdWarnResultHandle bsSgcJsjdWarnResultHandle)
     {
-        return toAjax(bsSgcJsjdWarnResultHandleService.updateById(bsSgcJsjdWarnResultHandle));
+        if (bsSgcJsjdWarnResultHandle.getStatus().equals("2")||
+        bsSgcJsjdWarnResultHandle.getStatus().equals("1")) {
+            BaseEntityUtils.preUpdate(bsSgcJsjdWarnResultHandle);
+            bsSgcJsjdWarnResultHandleService.updateById(bsSgcJsjdWarnResultHandle);
+            bsSgcJsjdWarnResultHandle.setId(UUID.randomUUID().toString());
+            bsSgcJsjdWarnResultHandle.setStatus(null);
+            BaseEntityUtils.preInsert(bsSgcJsjdWarnResultHandle);
+            bsSgcJsjdWarnResultHandleService.save(bsSgcJsjdWarnResultHandle);
+            return AjaxResult.success();
+        }else {
+            return toAjax(bsSgcJsjdWarnResultHandleService.updateById(bsSgcJsjdWarnResultHandle));
+        }
     }
 
     /**
diff --git a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResultHandle.java b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResultHandle.java
index e906b2f5..272ba14a 100644
--- a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResultHandle.java
+++ b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResultHandle.java
@@ -1,5 +1,6 @@
 package com.kms.warn.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -80,17 +81,19 @@ public class BsSgcJsjdWarnResultHandle extends BaseEntity
     @ApiModelProperty("${comment}")
     private String checkPhone;
 
-
+    @TableField(exist = false)
     private String projectName;
-
+    @TableField(exist = false)
     private String unit;
-
+    @TableField(exist = false)
     private String adcd;
-
+    @TableField(exist = false)
     private String warnType;
-
+    @TableField(exist = false)
     private String warnResult;
 
+    private String status;
+