From 7f620c68f6158d43be8ab4347b032952caf0377b Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 19 Nov 2021 14:25:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E7=AD=96=E9=87=8D=E7=82=B9=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E4=BA=8B=E4=B8=9A=E9=83=A8=20=E9=A3=8E=E9=99=A9?= =?UTF-8?q?=E9=A1=B9=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/PolicyWorkFlowService.java | 2 + .../controller/IssueTrackController.java | 15 ++- .../slrs/sarIssueTrack/dao/IssueTrackDao.java | 10 ++ .../slrs/sarIssueTrack/entity/IssueTrack.java | 13 +- .../service/impl/IssueTrackServiceImpl.java | 51 ++++---- .../IssueTrackMapper/IssueTrackMapper.xml | 120 ++++++++++++++++++ 6 files changed, 183 insertions(+), 28 deletions(-) create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/IssueTrackMapper/IssueTrackMapper.xml diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/PolicyWorkFlowService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/PolicyWorkFlowService.java index 410ec242..1f5ecdb7 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/PolicyWorkFlowService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/PolicyWorkFlowService.java @@ -34,7 +34,9 @@ public class PolicyWorkFlowService { .stream() .map(jsonObj -> { BusinessDeptIssue businessDeptIssue = JSONObject.parseObject(jsonObj.toString(), BusinessDeptIssue.class); + businessDeptIssue.setLawId(businessDeptIssue.getId()); businessDeptIssue.setId(UUIDUtils.randomUUID20()); + businessDeptIssue.setIsClose("0"); return businessDeptIssue; }).collect(Collectors.toList()) .stream() 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 e8885f95..6d748a48 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,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); + } } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/dao/IssueTrackDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/dao/IssueTrackDao.java index 4794d639..1ee14185 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/dao/IssueTrackDao.java +++ b/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 { + + + public IPage findPage(IPage page, @Param(value = "pageVo") IssueTrack pageVo); + + } 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 db9d94e3..3e3a492b 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 @@ -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") 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 b1a8b700..ab7ddd23 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,9 +25,20 @@ public class IssueTrackServiceImpl extends ServiceImpl 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 trackPage = new Page<>(objVo.getPage(), objVo.getPageSize()); - QueryWrapper 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 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); + } } + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/IssueTrackMapper/IssueTrackMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/IssueTrackMapper/IssueTrackMapper.xml new file mode 100644 index 00000000..c73b7f6c --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/IssueTrackMapper/IssueTrackMapper.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + issue.id,data_source,law_id,product_type,impl_time,impl_require + + + +