From e1037c73f17d744f40ba4cd8ae22b82951df4ce5 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 17 Nov 2021 10:36:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=94=BF=E7=AD=96=E9=87=8D=E7=82=B9?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E4=BA=8B=E4=B8=9A=E9=83=A8=20=E9=A3=8E?= =?UTF-8?q?=E9=99=A9=E9=A1=B9=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PolicyWorkFlowController.java | 2 +- .../da/workFlow/service/PolicyWorkFlowService.java | 12 ++++++++---- .../entity/BusinessDeptIssue.java | 4 ++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/PolicyWorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/PolicyWorkFlowController.java index 4b39a04b..f961bf6a 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/PolicyWorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/PolicyWorkFlowController.java @@ -56,7 +56,7 @@ public class PolicyWorkFlowController { private PolicyWorkFlowService policyWorkFlowService; /** - * 政策征求意见导出 + * 纳入重点问题管控 */ @PostMapping("/enterIssue") @ApiOperation("纳入重点问题管控") 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 e5db9b02..410ec242 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 @@ -21,9 +21,11 @@ public class PolicyWorkFlowService { public boolean enterIssue(String json){ boolean count=false; //是否成功 JSONObject dataJsonObj = JSONObject.parseObject(json); + JSONObject jsonData = dataJsonObj.getJSONObject("json"); - if ("1".equals(dataJsonObj.getString("department"))) { - JSONArray dataList = dataJsonObj.getJSONArray("dataList"); + + if ("1".equals( jsonData.getString("feedbackDept"))) { + JSONArray dataList = jsonData.getJSONArray("infoTableDatas"); /** * 把json对象转换未实体对象 @@ -31,11 +33,13 @@ public class PolicyWorkFlowService { List data = dataList .stream() .map(jsonObj -> { - BusinessDeptIssue businessDeptIssue = JSONObject.parseObject(jsonObj.toString(), BusinessDeptIssue.class); businessDeptIssue.setId(UUIDUtils.randomUUID20()); return businessDeptIssue; - }).collect(Collectors.toList()); + }).collect(Collectors.toList()) + .stream() + .filter(item->"1".equals(item.getIsRisk())) + .collect(Collectors.toList()); count=businessDeptIssueService.saveBatch(data); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java index de432cda..905cb9ee 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java @@ -85,6 +85,10 @@ public class BusinessDeptIssue { @TableField("is_close") private String isClose; + @ExcelIgnore + @TableField("is_risk") + private String isRisk; + @ExcelIgnore @TableField(exist = false) private Integer page; 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 2/4] =?UTF-8?q?=E6=94=BF=E7=AD=96=E9=87=8D=E7=82=B9?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E4=BA=8B=E4=B8=9A=E9=83=A8=20=E9=A3=8E?= =?UTF-8?q?=E9=99=A9=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 + + + + From 723569fbd7604d0935d0d768fdeb22fa43f353d2 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 21 Nov 2021 10:21:25 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=A0=87=E5=87=86=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E7=9B=B8=E5=90=8C=E9=A1=BA=E5=BA=8F=E6=8C=89?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml index 288146c0..9783c087 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml @@ -407,7 +407,7 @@ from TS_DICTIONARY dn LEFT JOIN TS_DICTYPE dt ON dn.ID = dt.DIC_ID where dictionary_code = #{dictionaryCode} AND dn.VALID_FLAG = 0 AND dt.VALID_FLAG = 0 AND dt.parent_id is NULL - order by show_index asc + order by show_index asc ,dt.dic_type_name asc