重点问题项管控模块-事业部接口

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/BusinessDeptIssueController.java

@@ -0,0 +1,66 @@
+package com.adc.da.slrs.sarStandUnqualified.controller;
+
+import com.adc.da.base.page.Pager;
+import com.adc.da.base.web.BaseController;
+import com.adc.da.http.PageInfo;
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue;
+import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssueVo;
+import com.adc.da.slrs.sarStandUnqualified.service.IBusinessDeptIssueService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Controller
+@RestController
+@RequestMapping("/api/sarStandUnqualified/businessDeptIssue")
+@Api(tags = "事业部重点问题")
+public class BusinessDeptIssueController extends BaseController {
+
+
+    @Autowired
+    private IBusinessDeptIssueService iBusinessDeptIssueService;
+
+    @PutMapping()
+    @ApiOperation("新增事业部重点问题")
+    public ResponseMessage addIssueTrack(@RequestBody BusinessDeptIssue issue){
+        boolean b = iBusinessDeptIssueService.addBussDeptIssue(issue);
+        return Result.success(b);
+    }
+
+
+    @DeleteMapping
+    @ApiOperation("删除事业部重点问题")
+    public ResponseMessage removeIssueTrack(@RequestParam(value="selectedString") String idList){
+        List<String> stringList = Arrays.asList(idList.split(","));
+        boolean b = iBusinessDeptIssueService.removeBussDeptIssue(stringList);
+        return Result.success(b);
+    }
+
+    @GetMapping
+    @ApiOperation("查询事业部重点问题")
+    public ResponseMessage<IPage<BusinessDeptIssue>> getIssueTrack(@RequestParam() BusinessDeptIssueVo pageVo){
+        IPage<BusinessDeptIssue> page = iBusinessDeptIssueService.getBussDeptIssue(pageVo);
+
+
+        return Result.success(page);
+
+    }
+
+    @PostMapping
+    @ApiOperation("更新事业部重点问题")
+    public ResponseMessage updateIssueTrack(@RequestBody BusinessDeptIssue issue){
+        boolean b = iBusinessDeptIssueService.updateBussDeptIssue(issue);
+        return Result.success(b);
+    }
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java

@@ -0,0 +1,58 @@
+package com.adc.da.slrs.sarStandUnqualified.controller;
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue;
+import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssueVo;
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Controller
+@RequestMapping("/api/sarStandUnqualified/productDeptIssue")
+@Api(tags = "产品规划部重点问题项管控")
+public class ProductDeptIssueController {
+
+    @Autowired
+    private IProductDeptIssueService iProductDeptIssueService;
+
+    @PutMapping()
+    @ApiOperation("新增产品规划部重点问题")
+    public ResponseMessage addProductDeptIssue(@RequestBody ProductDeptIssue issue){
+        boolean b = iProductDeptIssueService.addProductDeptIssue(issue);
+        return Result.success(b);
+    }
+
+
+    @DeleteMapping
+    @ApiOperation("删除产品规划部重点问题")
+    public ResponseMessage removeProductDeptIssue(@RequestParam(value="selectedString") String idList){
+
+        List<String> stringList = Arrays.asList(idList.split(","));
+        boolean b = iProductDeptIssueService.removeProductDeptIssue(stringList);
+        return Result.success(b);
+    }
+
+    @GetMapping
+    @ApiOperation("查询产品规划部重点问题")
+    public ResponseMessage<List<ProductDeptIssue>> getProductDeptIssue(ProductDeptIssueVo wrapper){
+        List<ProductDeptIssue> issueList = iProductDeptIssueService.getProductDeptIssue(wrapper);
+        return Result.success(issueList);
+    }
+
+    @PostMapping
+    @ApiOperation("更新产品规划部重点问题")
+    public ResponseMessage updateProductDeptIssue(@RequestBody ProductDeptIssue issue){
+        boolean b = iProductDeptIssueService.updateProductDeptIssue(issue);
+        return Result.success(b);
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/BusinessDeptIssueDao.java

@@ -2,11 +2,18 @@ package com.adc.da.slrs.sarStandUnqualified.dao;
 
 
 
+
 import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue;
+
+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.Mapper;
-import org.springframework.stereotype.Repository;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface BusinessDeptIssueDao extends BaseMapper<BusinessDeptIssue> {
+
+    IPage<BusinessDeptIssue> findPage(IPage<BusinessDeptIssue> page, @Param(Constants.WRAPPER) QueryWrapper<BusinessDeptIssue> queryWrapper);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java

@@ -1,7 +1,13 @@
 package com.adc.da.slrs.sarStandUnqualified.entity;
 
 
+import com.adc.da.base.page.BasePage;
+import com.adc.da.http.PageInfo;
+import com.baomidou.mybatisplus.annotation.TableField;
+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 lombok.Data;
 
 import java.util.Date;
@@ -10,17 +16,55 @@ import java.util.Date;
 @TableName("business_dept_issue")
 public class BusinessDeptIssue {
 
+  @TableId
   private String id;
+  @TableField("law_id")
   private String lawId;
+
+  @TableField(exist = false)
+  private String lawNumber;
+
+  @TableField(exist = false)
+  private String lawName;
+
+  @TableField("product_type")
   private String productType;
+
+  @TableField("impl_time")
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd")
   private Date implTime;
+
+  @TableField("impl_require")
   private String implRequire;
+
+  @TableField("conform_situation")
   private String conformSituation;
+
+  @TableField("dev_scheme")
   private String devScheme;
+
+  @TableField("sop_time")
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd")
   private Date sopTime;
+
+  @TableField("complete_situation")
   private String completeSituation;
+
+  @TableField("timeout_situation")
   private String timeoutSituation;
 
+  @TableLogic(value = "0",delval = "1")
+  private String delFlag;
 
+  @TableField("response_dept")
+  private String responseDept;
 
+  @TableField("response_people")
+  private String responsePeople;
+
+  @TableField(exist = false)
+  private Integer page;
+
+  @TableField(exist = false)
+  private Integer pageSize;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssueVo.java

@@ -0,0 +1,9 @@
+package com.adc.da.slrs.sarStandUnqualified.entity;
+
+import lombok.Data;
+
+@Data
+public class BusinessDeptIssueVo extends BusinessDeptIssue {
+
+    private String numberOrName;
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java

@@ -1,7 +1,11 @@
 package com.adc.da.slrs.sarStandUnqualified.entity;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
+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 lombok.Data;
 
 import java.util.Date;
@@ -10,16 +14,41 @@ import java.util.Date;
 @TableName("product_dept_issue")
 public class ProductDeptIssue {
 
+  @TableId
   private String id;
+
+  @TableField("law_id")
   private String lawId;
+
+  @TableField("product_business")
   private String productBusiness;
+
+  @TableField("platform")
   private String platform;
+
+  @TableField("poj_name")
   private String pojName;
+
+  @TableField("poj_description")
   private String pojDescription;
+
+  @TableField("current_node")
   private String currentNode;
+
+  @TableField("conceptual_state")
   private String conceptualState;
+
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd")
+  @TableField("scheduled_issuance_time")
   private Date scheduledIssuanceTime;
+
+  @TableField("revised_plan")
   private String revisedPlan;
+
+  @TableField("explanation")
   private String explanation;
 
+  @TableLogic(value = "0",delval = "1")
+  private String delFlag;
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssueVo.java

@@ -0,0 +1,4 @@
+package com.adc.da.slrs.sarStandUnqualified.entity;
+
+public class ProductDeptIssueVo extends ProductDeptIssue {
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IBusinessDeptIssueService.java

@@ -1,7 +1,22 @@
 package com.adc.da.slrs.sarStandUnqualified.service;
 
+import com.adc.da.slrs.sarIssueTrack.entity.IssueTrack;
+import com.adc.da.slrs.sarIssueTrack.entity.IssueTrackVo;
 import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue;
+import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssueVo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 public interface IBusinessDeptIssueService extends IService<BusinessDeptIssue> {
+
+
+    public boolean addBussDeptIssue(BusinessDeptIssue obj);
+
+    public boolean removeBussDeptIssue(List<String> idList);
+
+    public IPage<BusinessDeptIssue> getBussDeptIssue(BusinessDeptIssueVo objVo);
+
+    public boolean updateBussDeptIssue(BusinessDeptIssue obj);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java

@@ -1,4 +1,18 @@
 package com.adc.da.slrs.sarStandUnqualified.service;
 
+import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue;
+import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssueVo;
+
+import java.util.List;
+
 public interface IProductDeptIssueService {
+
+
+    public boolean addProductDeptIssue(ProductDeptIssue obj);
+
+    public boolean removeProductDeptIssue(List<String> idList);
+
+    public List<ProductDeptIssue> getProductDeptIssue(ProductDeptIssueVo objVo);
+
+    public boolean updateProductDeptIssue(ProductDeptIssue obj);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java

@@ -1,11 +1,71 @@
 package com.adc.da.slrs.sarStandUnqualified.service.impl;
 
+import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao;
+import com.adc.da.slrs.sarIssueTrack.entity.IssueTrack;
 import com.adc.da.slrs.sarStandUnqualified.dao.BusinessDeptIssueDao;
 import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue;
+import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssueVo;
 import com.adc.da.slrs.sarStandUnqualified.service.IBusinessDeptIssueService;
+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;
+
 @Service
 public class BusinessDeptIssueService extends ServiceImpl<BusinessDeptIssueDao, BusinessDeptIssue> implements IBusinessDeptIssueService  {
+
+    @Autowired
+    private BusinessDeptIssueDao businessDeptIssueDao;
+
+    @Override
+    public boolean addBussDeptIssue(BusinessDeptIssue obj) {
+        obj.setId(UUIDUtils.randomUUID20());
+        obj.setDelFlag("0");
+        return this.save(obj);
+    }
+
+    @Override
+    public boolean removeBussDeptIssue(List<String> idList) {
+        return removeByIds(idList);
+    }
+
+    @Override
+    public IPage<BusinessDeptIssue> getBussDeptIssue(BusinessDeptIssueVo pageVo) {
+
+        IPage<BusinessDeptIssue> page=new Page<>(pageVo.getPage(),pageVo.getPageSize());
+
+            QueryWrapper<BusinessDeptIssue> wrapper = new QueryWrapper<>();
+
+            if (pageVo.getNumberOrName()!=null){
+                wrapper.like("law_number",pageVo.getNumberOrName())
+                        .or()
+                        .like("law_name",pageVo.getNumberOrName());
+            }
+
+
+            if (pageVo.getLawNumber()!=null || pageVo.getProductType()!=null){
+                wrapper.like("law_number",pageVo.getLawNumber())
+                        .or()
+                        .like("law_name",pageVo.getLawName());
+            }
+
+            if (pageVo.getResponseDept()!=null){
+                wrapper.like("product_type",pageVo.getResponseDept());
+            }
+
+            page = businessDeptIssueDao.findPage(page, wrapper);
+
+        return page;
+    }
+
+    @Override
+    public boolean updateBussDeptIssue(BusinessDeptIssue obj) {
+        return this.updateById(obj);
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java

@@ -1,9 +1,53 @@
 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.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
 public class ProductDeptIssueService extends ServiceImpl<ProductDeptIssueDao,ProductDeptIssue>  implements IProductDeptIssueService {
+    @Override
+    public boolean addProductDeptIssue(ProductDeptIssue obj) {
+        obj.setId(UUIDUtils.randomUUID20());
+        obj.setDelFlag("0");
+        return this.save(obj);
+    }
+
+    @Override
+    public boolean removeProductDeptIssue(List<String> idList) {
+        return removeByIds(idList);
+    }
+
+    @Override
+    public List<ProductDeptIssue> getProductDeptIssue(ProductDeptIssueVo objVo) {
+        List<ProductDeptIssue> result=new ArrayList<>();
+        if (objVo==null){
+            result=this.list();
+        }else {
+            QueryWrapper<ProductDeptIssue> wrapper = new QueryWrapper<>();
+
+            if (objVo.getLawId()!=null){
+                wrapper.like("law_id",objVo.getLawId());
+            }
+
+
+            result=list(wrapper);
+        }
+
+        return result;
+    }
+
+    @Override
+    public boolean updateProductDeptIssue(ProductDeptIssue obj) {
+        return this.updateById(obj);
+    }
 }

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/BusinessDeptIssuempaaer.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.BusinessDeptIssueDao">
+
+    <resultMap id="BusinessIssuePage" type="com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue">
+        <result property="id" column="ID"/>
+        <result property="lawId" column="law_id"/>
+        <result property="lawNumber" column="LAWS_NUMBER"/>
+        <result property="lawName" column="LAWS_NAME"/>
+        <result property="productType" column="productType"/>
+        <result property="implTime" column="implTime"/>
+        <result property="implRequire" column="implRequire"/>
+        <result property="conformSituation" column="conformSituation"/>
+        <result property="devScheme" column="devScheme"/>
+        <result property="sopTime" column="sopTime"/>
+        <result property="completeSituation" column="completeSituation"/>
+        <result property="timeoutSituation" column="timeoutSituation"/>
+        <result property="responseDept" column="responseDept"/>
+        <result property="responsePeople" column="responsePeople"/>
+    </resultMap>
+
+
+    <select id="findPage" resultMap="BusinessIssuePage">
+        SELECT
+        	issue.*,laws.LAWS_NUMBER,laws.LAWS_NAME
+        FROM
+        	business_dept_issue AS issue
+        LEFT JOIN sar_laws_stand_info AS laws
+        ON issue.law_id = laws.ID
+        ${ew.customSqlSegment}
+    </select>
+</mapper>