Merge remote-tracking branch 'origin/master'

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;
+
 }

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;
 
 }

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;
 
 }

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));
+        }
     }
 
     /**

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;
+