From e80a05a0f88abe500f61ed4632e0666b32ef13ad Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 12 Nov 2021 10:11:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E9=97=AE=E9=A2=98=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E8=A7=84=E5=88=92=E9=83=A8=E5=85=B3=E9=97=AD=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductDeptIssueController.java | 15 ++++- .../dao/ProductDeptIssueDao.java | 7 +++ .../entity/ProductDeptIssue.java | 19 +++++++ .../service/IProductDeptIssueService.java | 5 +- .../service/impl/ProductDeptIssueService.java | 55 ++++++++++++++----- .../ProductDeptIssuempaaer.xml | 32 +++++++++++ 6 files changed, 117 insertions(+), 16 deletions(-) create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/ProductDeptIssuempaaer.xml diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java index 617dafa2..68d8d12a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java @@ -8,6 +8,7 @@ import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue; import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssueVo; import com.adc.da.slrs.sarStandUnqualified.service.IBusinessDeptIssueService; import com.adc.da.slrs.sarStandUnqualified.service.IProductDeptIssueService; +import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -44,8 +45,8 @@ public class ProductDeptIssueController { @GetMapping @ApiOperation("查询产品规划部重点问题") - public ResponseMessage> getProductDeptIssue(ProductDeptIssueVo wrapper){ - List issueList = iProductDeptIssueService.getProductDeptIssue(wrapper); + public ResponseMessage> getProductDeptIssue(@RequestParam ProductDeptIssueVo wrapper){ + IPage issueList = iProductDeptIssueService.getProductDeptIssue(wrapper); return Result.success(issueList); } @@ -55,4 +56,14 @@ public class ProductDeptIssueController { boolean b = iProductDeptIssueService.updateProductDeptIssue(issue); return Result.success(b); } + + + @PostMapping("/closeProductIssue") + @ApiOperation("关闭产品规划部重点问题") + public ResponseMessage closeProductDeptIssue(String idList){ + List stringList = Arrays.asList(idList.split(",")); + boolean b = iProductDeptIssueService.closeProductDeptIssue(stringList); + + return Result.success(b); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java index bda88181..ccef897d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java @@ -1,8 +1,15 @@ package com.adc.da.slrs.sarStandUnqualified.dao; import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +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 com.baomidou.mybatisplus.extension.service.IService; +import org.apache.ibatis.annotations.Param; public interface ProductDeptIssueDao extends BaseMapper { + + public IPage findPage(IPage page,@Param(Constants.WRAPPER) QueryWrapper wrapper); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java index 86515cde..f68f5d24 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.models.auth.In; import lombok.Data; import java.util.Date; @@ -20,6 +21,12 @@ public class ProductDeptIssue { @TableField("law_id") private String lawId; + @TableField(exist = false) + private String lawsNumber; + + @TableField(exist = false) + private String lawsName; + @TableField("product_business") private String productBusiness; @@ -48,7 +55,19 @@ public class ProductDeptIssue { @TableField("explanation") private String explanation; + @TableField("response_dept") + private String responseDept; + @TableLogic(value = "0",delval = "1") private String delFlag; + @TableField("is_close") + private String isClose; + + @TableField(exist = false) + private Integer page; + + @TableField(exist = false) + private Integer pageSize; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java index 805fc56f..a9e04a4a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandUnqualified.service; import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue; import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssueVo; +import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.List; @@ -12,7 +13,9 @@ public interface IProductDeptIssueService { public boolean removeProductDeptIssue(List idList); - public List getProductDeptIssue(ProductDeptIssueVo objVo); + public IPage getProductDeptIssue(ProductDeptIssueVo objVo); public boolean updateProductDeptIssue(ProductDeptIssue obj); + + public boolean closeProductDeptIssue(List idList); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java index 8ce467d4..ea9ba0c4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java @@ -1,20 +1,27 @@ package com.adc.da.slrs.sarStandUnqualified.service.impl; import com.adc.da.slrs.sarStandUnqualified.dao.ProductDeptIssueDao; -import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue; import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue; import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssueVo; import com.adc.da.slrs.sarStandUnqualified.service.IProductDeptIssueService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; @Service public class ProductDeptIssueService extends ServiceImpl implements IProductDeptIssueService { + + + @Autowired + private ProductDeptIssueDao productDeptIssueDao; + @Override public boolean addProductDeptIssue(ProductDeptIssue obj) { obj.setId(UUIDUtils.randomUUID20()); @@ -28,26 +35,48 @@ public class ProductDeptIssueService extends ServiceImpl getProductDeptIssue(ProductDeptIssueVo objVo) { - List result=new ArrayList<>(); - if (objVo==null){ - result=this.list(); - }else { - QueryWrapper wrapper = new QueryWrapper<>(); + public IPage getProductDeptIssue(ProductDeptIssueVo objVo) { - if (objVo.getLawId()!=null){ - wrapper.like("law_id",objVo.getLawId()); - } + IPage page=new Page<>(objVo.getPage(),objVo.getPage()); + QueryWrapper wrapper = new QueryWrapper<>(); - result=list(wrapper); + if (objVo.getLawsNumber()!=null){ + wrapper.like("laws.LAWS_NAME",objVo.getLawsName()) + .or() + .like("laws.LAWS_NUMBER",objVo.getLawsNumber()); } - return result; + if (objVo.getPojName()!=null){ + wrapper.like("poj_name",objVo.getPojName()); + } + + if (objVo.getResponseDept()!=null){ + wrapper.like("response_dept",objVo.getResponseDept()); + } + productDeptIssueDao.findPage(page,wrapper); + + return page; } @Override public boolean updateProductDeptIssue(ProductDeptIssue obj) { + return this.updateById(obj); } + + @Override + public boolean closeProductDeptIssue(List idList){ + + List collect = idList.stream() + .map(id -> { + ProductDeptIssue productDeptIssue = new ProductDeptIssue(); + productDeptIssue.setId(id); + productDeptIssue.setIsClose("1"); + return productDeptIssue; + }).collect(Collectors.toList()); + return this.updateBatchById(collect); + + } + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/ProductDeptIssuempaaer.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/ProductDeptIssuempaaer.xml new file mode 100644 index 00000000..fca51789 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/ProductDeptIssuempaaer.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + +