From 36568f8c19b3f39ada486691c07de5420bfc98c1 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Tue, 14 Dec 2021 13:55:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E8=AE=A4=E8=AF=81=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=92=8C=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/IssueTrackController.java      | 10 +++++-----
 .../slrs/sarIssueTrack/entity/IssueTrack.java |  4 ++--
 .../service/IIssueTrackService.java           |  2 +-
 .../service/impl/IssueTrackServiceImpl.java   | 19 ++++++++++++++-----
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java
index 51d19690..b8ce4322 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java
@@ -28,12 +28,12 @@ public class IssueTrackController {
     @PutMapping()
     @ApiOperation("新增重点标准跟踪清单项目")
     public ResponseMessage addIssueTrack(@RequestBody IssueTrack issueTrack){
-        boolean b = issueTrackService.addIssueTrack(issueTrack);
+        int b = issueTrackService.addIssueTrack(issueTrack);
 
-        if (b){
-        return Result.success("200","成功", true);
+        if (b>0){
+        return Result.success("200","信息已存在,更新!", true);
         }else{
-            return Result.error("100","数据不能相同", false);
+            return Result.error("100","新增成功!", false);
         }
     }
 
@@ -63,7 +63,7 @@ public class IssueTrackController {
         if (b){
             return Result.success("200","成功", true);
         }else{
-            return Result.error("100","数据不能相同", false);
+            return Result.error("100","标准或政策已存在", false);
         }
     }
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java
index 3e3a492b..12cc0873 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java
@@ -37,9 +37,9 @@ public class IssueTrack {
   @TableField("product_type")
   private String productType;
 
-  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
   @TableField("impl_time")
-  private Date implTime;
+  private String implTime;
 
   @TableField("impl_require")
   private String implRequire;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java
index 9324cbee..b51ad06b 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java
@@ -9,7 +9,7 @@ import java.util.Map;
 
 public interface IIssueTrackService {
 
-    public boolean addIssueTrack(IssueTrack obj);
+    public int addIssueTrack(IssueTrack obj);
 
     public boolean removeIssueTrack(List<String> idList);
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java
index 1a3188f4..0563be7c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java
@@ -25,14 +25,22 @@ public class IssueTrackServiceImpl extends ServiceImpl<IssueTrackDao, IssueTrack
 
 
     @Override
-    public boolean addIssueTrack(IssueTrack obj) {
+    public int addIssueTrack(IssueTrack obj) {
+
+        QueryWrapper<IssueTrack> countWrapper = new QueryWrapper<>();
+        countWrapper.eq("law_id",obj.getLawId())
+                .eq("del_flag",0);
+        int count = this.count(countWrapper);
+
         QueryWrapper<IssueTrack> wrapper = new QueryWrapper<>();
         wrapper.eq("law_id",obj.getLawId());
 
         obj.setId(UUIDUtils.randomUUID20());
         obj.setDelFlag("0");
+        this.saveOrUpdate(obj,wrapper);
 
-        return this.saveOrUpdate(obj,wrapper);
+
+        return count;
 
 
     }
@@ -56,12 +64,13 @@ public class IssueTrackServiceImpl extends ServiceImpl<IssueTrackDao, IssueTrack
     @Override
     public boolean updateIssueTrack(IssueTrack obj) {
         QueryWrapper<IssueTrack> wrapper = new QueryWrapper<>();
-        wrapper.eq("law_id",obj.getLawId());
+        wrapper.eq("law_id",obj.getLawId())
+                .eq("del_flag","0")
+                .ne("id",obj.getId());
         IssueTrack one = this.getOne(wrapper);
-        if (one==null){
+        if (one!=null){
             return false;
         }else {
-            obj.setId(UUIDUtils.randomUUID20());
             obj.setDelFlag("0");
             return this.updateById(obj);
         }