政策重点认证事业部 风险项入库

adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java

@@ -28,7 +28,12 @@ public class IssueTrackController {
     @ApiOperation("新增重点标准跟踪清单项目")
     public ResponseMessage addIssueTrack(@RequestBody IssueTrack issueTrack){
         boolean b = issueTrackService.addIssueTrack(issueTrack);
-        return Result.success(b);
+
+        if (b){
+        return Result.success("200","成功", true);
+        }else{
+            return Result.error("100","数据不能相同", false);
+        }
     }
 
 
@@ -52,6 +57,12 @@ public class IssueTrackController {
     @ApiOperation("更新重点标准跟踪清单项目")
     public ResponseMessage updateIssueTrack(@RequestBody IssueTrack issueTrack){
         boolean b = issueTrackService.updateIssueTrack(issueTrack);
-        return Result.success(b);
+//        return Result.success("200","数据不能相同",false);
+
+        if (b){
+            return Result.success("200","成功", true);
+        }else{
+            return Result.error("100","数据不能相同", false);
+        }
     }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/dao/IssueTrackDao.java

@@ -1,7 +1,17 @@
 package com.adc.da.slrs.sarIssueTrack.dao;
 
 import com.adc.da.slrs.sarIssueTrack.entity.IssueTrack;
+import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Param;
 
 public interface IssueTrackDao extends BaseMapper<IssueTrack> {
+
+
+    public IPage<IssueTrack> findPage(IPage<IssueTrack> page, @Param(value = "pageVo") IssueTrack pageVo);
+
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -20,7 +21,17 @@ public class IssueTrack {
   @TableField("law_id")
   private String lawId;
 
-  @TableField("law_name")
+  @ApiModelProperty("国内标准库 INLAND" +
+                    "海外标准库 FOREIGN" +
+                    "国内外政策库 FOREIGN_LAWS" +
+                    "企业标准库 BUSINESS_STAND")
+  @TableField("data_source")
+  private String dataSource;
+
+  @TableField(exist = false)
+  private String lawCode;
+
+  @TableField(exist = false)
   private String lawName;
 
   @TableField("product_type")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java

@@ -25,9 +25,20 @@ public class IssueTrackServiceImpl extends ServiceImpl<IssueTrackDao, IssueTrack
 
     @Override
     public boolean addIssueTrack(IssueTrack obj) {
-        obj.setId(UUIDUtils.randomUUID20());
-        obj.setDelFlag("0");
-        return this.save(obj);
+        QueryWrapper<IssueTrack> wrapper = new QueryWrapper<>();
+        wrapper.eq("law_id",obj.getLawId())
+                .eq("del_flag","0");
+
+        IssueTrack one = this.getOne(wrapper);
+        if (one==null){
+            return false;
+        }else {
+            obj.setId(UUIDUtils.randomUUID20());
+            obj.setDelFlag("0");
+            return this.save(obj);
+        }
+
+
     }
 
     @Override
@@ -40,26 +51,7 @@ public class IssueTrackServiceImpl extends ServiceImpl<IssueTrackDao, IssueTrack
 
         IPage<IssueTrack> trackPage = new Page<>(objVo.getPage(), objVo.getPageSize());
 
-        QueryWrapper<IssueTrack> wrapper = new QueryWrapper<>();
-
-        if (objVo.getPage()!=null && objVo.getPageSize()!=null){
-            trackPage=new Page<>(objVo.getPage(),objVo.getPageSize());
-        }else {
-            Integer count = issueTrackDao.selectCount(wrapper);
-            trackPage=new Page<>(0,count,false);
-        }
-
-        if (objVo.getLawId()!=null){
-            wrapper.like("law_id",objVo.getLawId());
-        }
-        if (objVo.getLawName()!=null){
-            wrapper.like("law_name",objVo.getLawName());
-        }
-        if (objVo.getProductType()!=null){
-            wrapper.like("product_type",objVo.getProductType());
-        }
-
-        trackPage = issueTrackDao.selectPage(trackPage, wrapper);
+        trackPage = issueTrackDao.findPage(trackPage,objVo);
 
 
         return trackPage;
@@ -67,7 +59,16 @@ public class IssueTrackServiceImpl extends ServiceImpl<IssueTrackDao, IssueTrack
 
     @Override
     public boolean updateIssueTrack(IssueTrack obj) {
-
-        return this.updateById(obj);
+        QueryWrapper<IssueTrack> wrapper = new QueryWrapper<>();
+        wrapper.eq("law_id",obj.getLawId());
+        IssueTrack one = this.getOne(wrapper);
+        if (one==null){
+            return false;
+        }else {
+            obj.setId(UUIDUtils.randomUUID20());
+            obj.setDelFlag("0");
+            return this.updateById(obj);
+        }
     }
+
 }