重点问题产品规划部关闭接口

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<List<ProductDeptIssue>> getProductDeptIssue(ProductDeptIssueVo wrapper){
-        List<ProductDeptIssue> issueList = iProductDeptIssueService.getProductDeptIssue(wrapper);
+    public ResponseMessage<IPage<ProductDeptIssue>> getProductDeptIssue(@RequestParam ProductDeptIssueVo wrapper){
+        IPage<ProductDeptIssue> 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<String> stringList = Arrays.asList(idList.split(","));
+        boolean b = iProductDeptIssueService.closeProductDeptIssue(stringList);
+
+        return Result.success(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<ProductDeptIssue> {
+
+    public IPage<ProductDeptIssue> findPage(IPage<ProductDeptIssue> page,@Param(Constants.WRAPPER) QueryWrapper<ProductDeptIssue> wrapper);
 }

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;
+
 }

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<String> idList);
 
-    public List<ProductDeptIssue> getProductDeptIssue(ProductDeptIssueVo objVo);
+    public IPage<ProductDeptIssue> getProductDeptIssue(ProductDeptIssueVo objVo);
 
     public boolean updateProductDeptIssue(ProductDeptIssue obj);
+
+    public boolean closeProductDeptIssue(List<String> idList);
 }

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<ProductDeptIssueDao,ProductDeptIssue>  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<ProductDeptIssueDao,Pro
     }
 
     @Override
-    public List<ProductDeptIssue> getProductDeptIssue(ProductDeptIssueVo objVo) {
-        List<ProductDeptIssue> result=new ArrayList<>();
-        if (objVo==null){
-            result=this.list();
-        }else {
-            QueryWrapper<ProductDeptIssue> wrapper = new QueryWrapper<>();
+    public IPage<ProductDeptIssue> getProductDeptIssue(ProductDeptIssueVo objVo) {
 
-            if (objVo.getLawId()!=null){
-                wrapper.like("law_id",objVo.getLawId());
-            }
+        IPage<ProductDeptIssue> page=new Page<>(objVo.getPage(),objVo.getPage());
 
+        QueryWrapper<ProductDeptIssue> 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<String> idList){
+
+        List<ProductDeptIssue> collect = idList.stream()
+                .map(id -> {
+                    ProductDeptIssue productDeptIssue = new ProductDeptIssue();
+                    productDeptIssue.setId(id);
+                    productDeptIssue.setIsClose("1");
+                    return productDeptIssue;
+                }).collect(Collectors.toList());
+        return this.updateBatchById(collect);
+
+    }
+
 }

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/ProductDeptIssuempaaer.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.sarStandUnqualified.dao.ProductDeptIssueDao">
+
+    <resultMap id="ProductIssuePage" type="com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue">
+        <result property="id" column="ID"/>
+        <result property="lawId" column="law_id"/>
+        <result property="lawsNumber" column="LAWS_NUMBER"/>
+        <result property="productBusiness" column="product_business"/>
+        <result property="platform" column="platform"/>
+        <result property="pojName" column="poj_name"/>
+        <result property="pojDescription" column="poj_description"/>
+        <result property="currentNode" column="current_node"/>
+        <result property="conceptualState" column="conceptual_state"/>
+        <result property="scheduledIssuanceTime" column="scheduled_issuance_time"/>
+        <result property="revisedPlan" column="revised_plan"/>
+        <result property="explanation" column="explanation"/>
+        <result property="responseDept" column="response_dept"/>
+
+    </resultMap>
+
+
+    <select id="findPage" resultMap="ProductIssuePage">
+        SELECT
+        	issue.*,laws.LAWS_NUMBER,laws.LAWS_NAME
+        FROM
+        	product_dept_issue AS issue
+        LEFT JOIN sar_laws_stand_info AS laws
+        ON issue.law_id = laws.ID
+        ${ew.customSqlSegment}
+    </select>
+</mapper>