From 2769bd73236186e3c1c16151350fdeefd9e7c40a Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 8 Nov 2021 20:53:21 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E9=87=8D=E7=82=B9=E6=A0=87=E5=87=86?= =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E6=B8=85=E5=8D=95curd=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IssueTrackController.java | 56 ++++++++++++++++++ .../slrs/sarIssueTrack/dao/IssueTrackDao.java | 7 +++ .../slrs/sarIssueTrack/entity/IssueTrack.java | 41 +++++++++++++ .../sarIssueTrack/entity/IssueTrackVo.java | 7 +++ .../service/IIssueTrackService.java | 17 ++++++ .../service/impl/IssueTrackServiceImpl.java | 58 +++++++++++++++++++ 6 files changed, 186 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/dao/IssueTrackDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrackVo.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java 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 new file mode 100644 index 00000000..d522496f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java @@ -0,0 +1,56 @@ +package com.adc.da.slrs.sarIssueTrack.controller; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarIssueTrack.entity.IssueTrack; +import com.adc.da.slrs.sarIssueTrack.entity.IssueTrackVo; +import com.adc.da.slrs.sarIssueTrack.service.IIssueTrackService; +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 +@RestController +@Api(tags = "重点标准跟踪清单") +@RequestMapping("/api/sarIssueTrack/issueTrack") +public class IssueTrackController { + + @Autowired + private IIssueTrackService issueTrackService; + + @PutMapping() + @ApiOperation("新增重点标准跟踪清单项目") + public ResponseMessage addIssueTrack(@RequestBody IssueTrack issueTrack){ + boolean b = issueTrackService.addIssueTrack(issueTrack); + return Result.success(b); + } + + + @DeleteMapping + @ApiOperation("删除重点标准跟踪清单项目") + public ResponseMessage removeIssueTrack(@RequestParam(value="selectedString") String idList){ + + List stringList = Arrays.asList(idList.split(",")); + boolean b = issueTrackService.removeIssueTrack(stringList); + return Result.success(b); + } + + @GetMapping + @ApiOperation("查询重点标准跟踪清单") + public ResponseMessage> getIssueTrack(IssueTrackVo wrapper){ + List issueTrack = issueTrackService.getIssueTrack(wrapper); + return Result.success(issueTrack); + } + + @PostMapping + @ApiOperation("更新重点标准跟踪清单项目") + public ResponseMessage updateIssueTrack(@RequestBody IssueTrack issueTrack){ + boolean b = issueTrackService.updateIssueTrack(issueTrack); + return Result.success(b); + } +} 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 new file mode 100644 index 00000000..4794d639 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/dao/IssueTrackDao.java @@ -0,0 +1,7 @@ +package com.adc.da.slrs.sarIssueTrack.dao; + +import com.adc.da.slrs.sarIssueTrack.entity.IssueTrack; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +public interface IssueTrackDao extends BaseMapper { +} 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 new file mode 100644 index 00000000..026892f5 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java @@ -0,0 +1,41 @@ +package com.adc.da.slrs.sarIssueTrack.entity; + +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 lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + + +@Data +@TableName("issue_track") +public class IssueTrack { + + @TableField("id") + private String id; + + @TableField("law_id") + private String lawId; + + @TableField("law_name") + private String lawName; + + @TableField("product_type") + private String productType; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd") + @TableField("impl_time") + private Date implTime; + + @TableField("impl_require") + private String implRequire; + + @TableLogic(value = "0",delval = "1") + @TableField("del_flag") + private String delFlag; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrackVo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrackVo.java new file mode 100644 index 00000000..eec4bf15 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrackVo.java @@ -0,0 +1,7 @@ +package com.adc.da.slrs.sarIssueTrack.entity; + +import lombok.Data; + +@Data +public class IssueTrackVo extends IssueTrack { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java new file mode 100644 index 00000000..ffbf0b8c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java @@ -0,0 +1,17 @@ +package com.adc.da.slrs.sarIssueTrack.service; + +import com.adc.da.slrs.sarIssueTrack.entity.IssueTrack; +import com.adc.da.slrs.sarIssueTrack.entity.IssueTrackVo; + +import java.util.List; + +public interface IIssueTrackService { + + public boolean addIssueTrack(IssueTrack obj); + + public boolean removeIssueTrack(List idList); + + public List getIssueTrack(IssueTrackVo objVo); + + public boolean updateIssueTrack(IssueTrack obj); +} 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 new file mode 100644 index 00000000..d9928e54 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java @@ -0,0 +1,58 @@ +package com.adc.da.slrs.sarIssueTrack.service.impl; + +import com.adc.da.slrs.sarIssueTrack.dao.IssueTrackDao; +import com.adc.da.slrs.sarIssueTrack.entity.IssueTrack; +import com.adc.da.slrs.sarIssueTrack.entity.IssueTrackVo; +import com.adc.da.slrs.sarIssueTrack.service.IIssueTrackService; +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 IssueTrackServiceImpl extends ServiceImpl implements IIssueTrackService { + @Override + public boolean addIssueTrack(IssueTrack obj) { + obj.setId(UUIDUtils.randomUUID20()); + obj.setDelFlag("0"); + return this.save(obj); + } + + @Override + public boolean removeIssueTrack(List idList) { + return removeByIds(idList); + } + + @Override + public List getIssueTrack(IssueTrackVo objVo) { + List result=new ArrayList<>(); + if (objVo==null){ + result=this.list(); + }else { + QueryWrapper wrapper = new QueryWrapper<>(); + + 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()); + } + + result=list(wrapper); + } + + return result; + } + + @Override + public boolean updateIssueTrack(IssueTrack obj) { + + return this.updateById(obj); + } +} From 78b3ed605dc43a28cacb7e2d5300b7ece2893397 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 10 Nov 2021 09:58:38 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=87=8D=E7=82=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E9=A1=B9=E7=AE=A1=E6=8E=A7=E6=A8=A1=E5=9D=97-=E4=BA=8B?= =?UTF-8?q?=E4=B8=9A=E9=83=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessDeptIssueController.java | 66 +++++++++++++++++++ .../ProductDeptIssueController.java | 58 ++++++++++++++++ .../dao/BusinessDeptIssueDao.java | 9 ++- .../entity/BusinessDeptIssue.java | 44 +++++++++++++ .../entity/BusinessDeptIssueVo.java | 9 +++ .../entity/ProductDeptIssue.java | 29 ++++++++ .../entity/ProductDeptIssueVo.java | 4 ++ .../service/IBusinessDeptIssueService.java | 15 +++++ .../service/IProductDeptIssueService.java | 14 ++++ .../impl/BusinessDeptIssueService.java | 60 +++++++++++++++++ .../service/impl/ProductDeptIssueService.java | 44 +++++++++++++ .../BusinessDeptIssuempaaer.xml | 32 +++++++++ 12 files changed, 383 insertions(+), 1 deletion(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/BusinessDeptIssueController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssueVo.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssueVo.java create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/BusinessDeptIssuempaaer.xml diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/BusinessDeptIssueController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/BusinessDeptIssueController.java new file mode 100644 index 00000000..b311005d --- /dev/null +++ b/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 stringList = Arrays.asList(idList.split(",")); + boolean b = iBusinessDeptIssueService.removeBussDeptIssue(stringList); + return Result.success(b); + } + + @GetMapping + @ApiOperation("查询事业部重点问题") + public ResponseMessage> getIssueTrack(@RequestParam() BusinessDeptIssueVo pageVo){ + IPage 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); + } + + +} 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 new file mode 100644 index 00000000..617dafa2 --- /dev/null +++ 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 stringList = Arrays.asList(idList.split(",")); + boolean b = iProductDeptIssueService.removeProductDeptIssue(stringList); + return Result.success(b); + } + + @GetMapping + @ApiOperation("查询产品规划部重点问题") + public ResponseMessage> getProductDeptIssue(ProductDeptIssueVo wrapper){ + List 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); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/BusinessDeptIssueDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/BusinessDeptIssueDao.java index f7e83ff4..7ceffc8f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/BusinessDeptIssueDao.java +++ 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 { + + IPage findPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } 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 8a60ea81..7e5c8d87 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 @@ -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; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssueVo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssueVo.java new file mode 100644 index 00000000..e7214289 --- /dev/null +++ b/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; +} 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 4013565f..86515cde 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 @@ -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; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssueVo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssueVo.java new file mode 100644 index 00000000..b508e813 --- /dev/null +++ b/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 { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IBusinessDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IBusinessDeptIssueService.java index f666a013..4548872b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IBusinessDeptIssueService.java +++ b/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 { + + + public boolean addBussDeptIssue(BusinessDeptIssue obj); + + public boolean removeBussDeptIssue(List idList); + + public IPage getBussDeptIssue(BusinessDeptIssueVo objVo); + + public boolean updateBussDeptIssue(BusinessDeptIssue obj); } 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 3d87745d..805fc56f 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 @@ -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 idList); + + public List getProductDeptIssue(ProductDeptIssueVo objVo); + + public boolean updateProductDeptIssue(ProductDeptIssue obj); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java index c83ee8b9..0cc26cce 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java +++ b/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 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 idList) { + return removeByIds(idList); + } + + @Override + public IPage getBussDeptIssue(BusinessDeptIssueVo pageVo) { + + IPage page=new Page<>(pageVo.getPage(),pageVo.getPageSize()); + + QueryWrapper 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); + } } 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 046c56b1..8ce467d4 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,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 implements IProductDeptIssueService { + @Override + public boolean addProductDeptIssue(ProductDeptIssue obj) { + obj.setId(UUIDUtils.randomUUID20()); + obj.setDelFlag("0"); + return this.save(obj); + } + + @Override + public boolean removeProductDeptIssue(List idList) { + return removeByIds(idList); + } + + @Override + public List getProductDeptIssue(ProductDeptIssueVo objVo) { + List result=new ArrayList<>(); + if (objVo==null){ + result=this.list(); + }else { + QueryWrapper 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); + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/BusinessDeptIssuempaaer.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/BusinessDeptIssuempaaer.xml new file mode 100644 index 00000000..672fa243 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/BusinessDeptIssuempaaer.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + From f17cd2c97540ecb18c0a8cfffa641d52f4ea88e8 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 11 Nov 2021 15:15:56 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=AF=B9=E6=AF=94excel=E5=92=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comment/ExclErrorOut.java | 2 +- .../ImportExcelDatas/comment/ExclExport.java | 87 ++++++++++++++++++- .../controller/ImportExcelController.java | 7 ++ .../service/ImportExcelService.java | 3 + .../service/impl/ImportExcelServiceImpl.java | 32 +++++++ 5 files changed, 126 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclErrorOut.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclErrorOut.java index 1efb078a..f8a81979 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclErrorOut.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclErrorOut.java @@ -15,7 +15,7 @@ import java.util.List; @Component public class ExclErrorOut { - private static final Logger logger = LoggerFactory.getLogger(BussStandExportUtil.class); + private static final Logger logger = LoggerFactory.getLogger(ExclErrorOut.class); public static Workbook exportDatas (List datas,String header) { Workbook workbook = new XSSFWorkbook(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java index 29ff23c1..82d2f20c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java @@ -1,17 +1,29 @@ package com.adc.da.slrs.ImportExcelDatas.comment; import com.adc.da.slrs.ImportExcelDatas.entity.ImportDto; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFRow; +import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; + + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; + +import java.util.*; +import java.util.stream.Collectors; -import java.util.List; -import java.util.Map; @Component public class ExclExport extends ExclErrorOut { + private static final Logger logger = LoggerFactory.getLogger(ExclErrorOut.class); /** * 导出多个sheet页的excl @@ -34,4 +46,71 @@ public class ExclExport extends ExclErrorOut { return workbook; } + + /** + * 比对表格中的数据是否在数据库表中 + * @param sourceFile + * @return + */ + public void contrast(MultipartFile sourceFile, HashSet> set) throws IOException { + + + InputStream inputStream = sourceFile.getInputStream(); + XSSFWorkbook workbook = new XSSFWorkbook(inputStream); + + XSSFSheet sheet = workbook.getSheetAt(0); + + + +// HashMap map = new HashMap<>(); + int lastNum = sheet.getLastRowNum(); + for (int i = 0; i < lastNum; i++) { + + XSSFRow row = sheet.getRow(i); + + + if (row.getCell(1)!=null){ +// String value = row.getCell(1).toString(); + +// map.put(value,String.valueOf(i)); + String value = row.getCell(1).toString(); + Cell cell = row.createCell(11); + Set> collect = set.stream() + .filter(item -> + value.contains(item.get(0).trim()) + || value.contains(item.get(1).trim()) + || value.contains(item.get(2).trim()) + ) + .collect(Collectors.toSet()); + + + if (!collect.isEmpty()){ + logger.info("*"); + cell.setCellType(CellType.STRING); + cell.setCellValue("1"); + }else { + logger.info("-"); + cell.setCellType(CellType.STRING); + cell.setCellValue("0"); + } + } + +// map.strea +// List filterList=map.stre() +// .filter(user -> serviceCodes.contains(user.getOrgId())) +// .collect(Collectors.toList()); + + + + } + + File file = new File("C:\\Users\\22501\\Desktop\\foton标准数据\\ouhuo.xlsx"); + FileOutputStream os = new FileOutputStream(file); + workbook.write(os); + } + + + + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java index bf2f0174..0553d92c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java @@ -139,4 +139,11 @@ public class ImportExcelController extends BaseController { } + + @ApiOperation("从excl中导入标准信息") + @PostMapping("/isExist") + public String isExist(MultipartFile exclFile){ + return importExcelService.isExist(exclFile); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/ImportExcelService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/ImportExcelService.java index 95eaa3af..9513517b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/ImportExcelService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/ImportExcelService.java @@ -15,4 +15,7 @@ public interface ImportExcelService extends IService { public List storageExclData(Map> importListMap); public Map> analysisExcl(MultipartFile exclFile,MultipartFile standSort); + + + public String isExist(MultipartFile exclFile); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java index aa56d921..765ed853 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.ImportExcelDatas.service.impl; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.att.vo.AttFileVo; +import com.adc.da.slrs.ImportExcelDatas.comment.ExclExport; import com.adc.da.slrs.ImportExcelDatas.dao.ImportExcelDao; import com.adc.da.slrs.ImportExcelDatas.entity.ImportDto; import com.adc.da.slrs.ImportExcelDatas.service.ImportExcelService; @@ -598,6 +599,37 @@ public class ImportExcelServiceImpl extends ServiceImpl standWrapper = new QueryWrapper<>(); + standWrapper.select("STAND_NAME,STAND_SORT,STAND_YEAR"); + List> maps = sarStandardsInfoService.listMaps(standWrapper); + + QueryWrapper bussionessWrapper = new QueryWrapper<>(); + bussionessWrapper.select("STAND_NAME,STAND_SORT,STAND_YEAR"); + List> maps1 = sarBussionessStandService.listMaps(bussionessWrapper); + + HashSet> nameSet = new HashSet<>(); + maps.addAll(maps1); + maps.forEach(item->{ + List strings = new LinkedList<>(); + strings.add(item.get("STAND_NAME").toString().trim()); + strings.add(item.get("STAND_SORT").toString().trim()); + strings.add(item.get("STAND_YEAR").toString().trim()); + + nameSet.add(strings); + }); + + try { + exclExport.contrast(exclFile,nameSet); + return "success"; + }catch (Exception e){ + e.printStackTrace(); + return "failed"; + } + } + /** * 整理为标准信息实体 From d6ef4b4d2f2a2283d069772ccfa6eb6905b174a7 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 11 Nov 2021 15:39:24 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=AF=B9=E6=AF=94excel=E5=92=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E6=A0=87=E5=87=86=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/ImportExcelDatas/comment/ExclExport.java | 4 ++-- .../service/impl/ImportExcelServiceImpl.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java index 82d2f20c..40b9703e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java @@ -78,8 +78,8 @@ public class ExclExport extends ExclErrorOut { Set> collect = set.stream() .filter(item -> value.contains(item.get(0).trim()) - || value.contains(item.get(1).trim()) - || value.contains(item.get(2).trim()) + && value.contains(item.get(1).trim()) + && value.contains(item.get(2).trim()) ) .collect(Collectors.toSet()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java index 765ed853..6ff028c3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java @@ -603,18 +603,18 @@ public class ImportExcelServiceImpl extends ServiceImpl standWrapper = new QueryWrapper<>(); - standWrapper.select("STAND_NAME,STAND_SORT,STAND_YEAR"); + standWrapper.select("STAND_NUMBER,STAND_SORT,STAND_YEAR"); List> maps = sarStandardsInfoService.listMaps(standWrapper); QueryWrapper bussionessWrapper = new QueryWrapper<>(); - bussionessWrapper.select("STAND_NAME,STAND_SORT,STAND_YEAR"); + bussionessWrapper.select("STAND_CODE AS STAND_NUMBER,STAND_SORT,STAND_YEAR"); List> maps1 = sarBussionessStandService.listMaps(bussionessWrapper); HashSet> nameSet = new HashSet<>(); maps.addAll(maps1); maps.forEach(item->{ List strings = new LinkedList<>(); - strings.add(item.get("STAND_NAME").toString().trim()); + strings.add(item.get("STAND_NUMBER").toString().trim()); strings.add(item.get("STAND_SORT").toString().trim()); strings.add(item.get("STAND_YEAR").toString().trim()); From a76a135e880792b9807ea97f2f3a905ec3f7e581 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 12 Nov 2021 10:10:07 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E9=87=8D=E7=82=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BA=8B=E4=B8=9A=E9=83=A8=E5=AF=BC=E5=87=BA=E5=92=8C=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ImportExcelDatas/comment/Analysis.java | 125 ++++++++++++++++++ .../BusinessDeptIssueController.java | 72 ++++++++-- .../entity/BusinessDeptIssue.java | 25 ++++ .../entity/BusinessDeptIssueVo.java | 17 +++ .../service/IBusinessDeptIssueService.java | 10 +- .../impl/BusinessDeptIssueService.java | 77 +++++++---- .../BusinessDeptIssuempaaer.xml | 20 +-- 7 files changed, 297 insertions(+), 49 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/Analysis.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/Analysis.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/Analysis.java new file mode 100644 index 00000000..a9b06720 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/Analysis.java @@ -0,0 +1,125 @@ +package com.adc.da.slrs.ImportExcelDatas.comment; + +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.time.Year; +import java.util.HashSet; +import java.util.List; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + +@Component +public class Analysis { + + private static final Logger logger = LoggerFactory.getLogger(Contrast.class); + + public void run(MultipartFile file, MultipartFile sort) throws IOException { + + InputStream inputStream = file.getInputStream(); + XSSFWorkbook workbook = new XSSFWorkbook(inputStream); + + XSSFSheet sheet = workbook.getSheetAt(0); + + HashSet sortSet = getSet(sort); + + for (Row row : sheet) { + if (row.getCell(1)!=null){ + //获取表1的标准号 + String value = row.getCell(1).toString().trim(); + Cell sortCell = row.createCell(11); + Cell sortNumber = row.createCell(12); + Cell sortYear = row.createCell(13); + + sortCell.setCellType(CellType.STRING); + sortNumber.setCellType(CellType.STRING); + sortYear.setCellType(CellType.STRING); + + List collect = sortSet.stream() + .filter(item ->{ + int length = item.length(); + if (value.length()>length){ + return value.substring(0, length).contains(item.trim()); + }else return false; + }) + .collect(Collectors.toList()); + + //对比在表2中是否存在 + if (collect.size()==1){ + + String sortStr = collect.get(0); + int length = sortStr.length(); + logger.info("*"); +// Pattern pattern = Pattern.compile("^\\S*\\s\\S*[\\u2014\\u002d\\s]\\d{4}$"); +// pattern.matcher(standId).matches() + if (value.length()>=length+5){ + sortCell.setCellValue(collect.get(0)); + sortNumber.setCellValue(value.substring(length,value.length()-5)); + sortYear.setCellValue(value.substring(value.length()-4)); + } + }else if (collect.size()>1){ + String maxLenSort=""; + for (String s : collect) { + if (s.length()>maxLenSort.length()){ + maxLenSort=s; + } + } + + int length = maxLenSort.length(); + + if (value.length()>=length+5){ + logger.info("+"); + + + sortCell.setCellValue(maxLenSort); + sortNumber.setCellValue(value.substring(length,value.length()-5)); + sortYear.setCellValue(value.substring(value.length()-4)); + } + + } else { + logger.info("-"); + + sortCell.setCellValue("-"); + sortNumber.setCellValue("-"); + sortYear.setCellValue("-"); + } + } + } + File result = new File("C:\\Users\\22501\\Desktop\\foton标准数据\\拆分标准号-海外.xlsx"); + FileOutputStream os = new FileOutputStream(result); + workbook.write(os); +// HashMap map = new HashMap<>(); + + } + + private HashSet getSet(MultipartFile file) throws IOException { + InputStream inputStream = file.getInputStream(); + XSSFWorkbook workbook = new XSSFWorkbook(inputStream); + + XSSFSheet sheet = workbook.getSheetAt(0); + +// int lastNum = sheet.getLastRowNum(); + + HashSet stringHashSet= new HashSet<>(); + + for (Row row : sheet) { + if (row.getCell(0)!=null){ + stringHashSet.add(row.getCell(0).toString().trim()); + } + } + + return stringHashSet; + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/BusinessDeptIssueController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/BusinessDeptIssueController.java index b311005d..2a2c313b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/BusinessDeptIssueController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/BusinessDeptIssueController.java @@ -1,21 +1,24 @@ 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.alibaba.excel.EasyExcel; +import com.alibaba.fastjson.JSONObject; 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 javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.net.URLEncoder; import java.util.Arrays; import java.util.List; @@ -31,24 +34,24 @@ public class BusinessDeptIssueController extends BaseController { @PutMapping() @ApiOperation("新增事业部重点问题") - public ResponseMessage addIssueTrack(@RequestBody BusinessDeptIssue issue){ - boolean b = iBusinessDeptIssueService.addBussDeptIssue(issue); + public ResponseMessage addBussDeptIssue(@RequestBody BusinessDeptIssue issue){ + boolean b = iBusinessDeptIssueService.addBusinessDeptIssue(issue); return Result.success(b); } @DeleteMapping @ApiOperation("删除事业部重点问题") - public ResponseMessage removeIssueTrack(@RequestParam(value="selectedString") String idList){ + public ResponseMessage removeBussDeptIssue(@RequestParam(value="selectedString") String idList){ List stringList = Arrays.asList(idList.split(",")); - boolean b = iBusinessDeptIssueService.removeBussDeptIssue(stringList); + boolean b = iBusinessDeptIssueService.removeBusinessDeptIssue(stringList); return Result.success(b); } @GetMapping @ApiOperation("查询事业部重点问题") - public ResponseMessage> getIssueTrack(@RequestParam() BusinessDeptIssueVo pageVo){ - IPage page = iBusinessDeptIssueService.getBussDeptIssue(pageVo); + public ResponseMessage> getBussDeptIssue(BusinessDeptIssueVo pageVo){ + IPage page = iBusinessDeptIssueService.getBusinessDeptIssue(pageVo); return Result.success(page); @@ -57,10 +60,57 @@ public class BusinessDeptIssueController extends BaseController { @PostMapping @ApiOperation("更新事业部重点问题") - public ResponseMessage updateIssueTrack(@RequestBody BusinessDeptIssue issue){ - boolean b = iBusinessDeptIssueService.updateBussDeptIssue(issue); + public ResponseMessage updateBussDeptIssue(@RequestBody BusinessDeptIssue issue){ + boolean b = iBusinessDeptIssueService.updateBusinessDeptIssue(issue); return Result.success(b); } + @PostMapping("/closeIssue") + @ApiOperation("批量关闭事业部重点问题") + public ResponseMessage closeBusinessIssue(@RequestParam(value="ids")String idList){ + List stringList = Arrays.asList(idList.split(",")); + boolean b = iBusinessDeptIssueService.closeBusinessDeptIssue(stringList); + return Result.success(b); + + } + + + @GetMapping("/exportIssue") + @ApiOperation("导出事业部重点问题") + public void exportIssue(HttpServletResponse response,BusinessDeptIssueVo issue) throws IOException { + // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman + + //TODO + try { + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding("utf-8"); + // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 + + if(issue.getFileName()==null || issue.getFileName()==""){ + issue.setFileName("事业部重点问题信息"); + } + String fileName = URLEncoder.encode(issue.getFileName(), "UTF-8").replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); +// List data=sarStandUnqualifiedService.getStandUnqualifiedExcelData(standUnqualifiedExcelVO); + + JSONObject jsonObject = JSONObject.parseObject(issue.getExportContent()); + + BusinessDeptIssueVo businessDeptIssueVo = JSONObject.toJavaObject(jsonObject, BusinessDeptIssueVo.class); + IPage page = iBusinessDeptIssueService.getBusinessDeptIssue(businessDeptIssueVo); + + + // 这里需要设置不关闭流 + EasyExcel.write(response.getOutputStream(), BusinessDeptIssue.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") + .doWrite(page.getRecords()); + } catch (Exception e) { + e.printStackTrace(); + // 重置response + response.reset(); + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + response.getWriter().println(JSONObject.toJSONString(Result.error())); + } + } + } 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 7e5c8d87..de432cda 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 @@ -3,6 +3,8 @@ package com.adc.da.slrs.sarStandUnqualified.entity; import com.adc.da.base.page.BasePage; import com.adc.da.http.PageInfo; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; @@ -16,55 +18,78 @@ import java.util.Date; @TableName("business_dept_issue") public class BusinessDeptIssue { + + @ExcelIgnore @TableId private String id; + + @ExcelIgnore @TableField("law_id") private String lawId; + @ExcelProperty("标准号") @TableField(exist = false) private String lawNumber; + @ExcelProperty("标准名称") @TableField(exist = false) private String lawName; + @ExcelProperty("产品类别") @TableField("product_type") private String productType; + @ExcelProperty("实施实践") @TableField("impl_time") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd") private Date implTime; + @ExcelProperty("实施要求") @TableField("impl_require") private String implRequire; + @ExcelProperty("资源符合状态") @TableField("conform_situation") private String conformSituation; + @ExcelProperty("开发情况") @TableField("dev_scheme") private String devScheme; + @ExcelProperty("sop时间") @TableField("sop_time") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd") private Date sopTime; + @ExcelProperty("完成情况") @TableField("complete_situation") private String completeSituation; + @ExcelProperty("超出sop时限后计划") @TableField("timeout_situation") private String timeoutSituation; + @ExcelIgnore @TableLogic(value = "0",delval = "1") private String delFlag; + @ExcelProperty("责任部门") @TableField("response_dept") private String responseDept; + @ExcelProperty("责任人") @TableField("response_people") private String responsePeople; + @ExcelIgnore + @TableField("is_close") + private String isClose; + + @ExcelIgnore @TableField(exist = false) private Integer page; + @ExcelIgnore @TableField(exist = false) private Integer pageSize; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssueVo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssueVo.java index e7214289..a2f4f90a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssueVo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssueVo.java @@ -2,8 +2,25 @@ package com.adc.da.slrs.sarStandUnqualified.entity; import lombok.Data; +import java.util.Arrays; +import java.util.List; + @Data public class BusinessDeptIssueVo extends BusinessDeptIssue { private String numberOrName; + + private String fileName; + + private String idList; + + private String exportContent; + + public List getIdList(){ + if (this.idList!=null){ + return Arrays.asList(this.idList.split(",")); + }else { + return null; + } + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IBusinessDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IBusinessDeptIssueService.java index 4548872b..2103c61a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IBusinessDeptIssueService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IBusinessDeptIssueService.java @@ -12,11 +12,13 @@ import java.util.List; public interface IBusinessDeptIssueService extends IService { - public boolean addBussDeptIssue(BusinessDeptIssue obj); + public boolean addBusinessDeptIssue(BusinessDeptIssue obj); - public boolean removeBussDeptIssue(List idList); + public boolean removeBusinessDeptIssue(List idList); - public IPage getBussDeptIssue(BusinessDeptIssueVo objVo); + public IPage getBusinessDeptIssue(BusinessDeptIssueVo objVo); - public boolean updateBussDeptIssue(BusinessDeptIssue obj); + public boolean updateBusinessDeptIssue(BusinessDeptIssue obj); + + public boolean closeBusinessDeptIssue(List idList); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java index 0cc26cce..b807d0c6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java @@ -1,7 +1,5 @@ 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; @@ -14,8 +12,8 @@ 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 BusinessDeptIssueService extends ServiceImpl implements IBusinessDeptIssueService { @@ -24,48 +22,79 @@ public class BusinessDeptIssueService extends ServiceImpl idList) { + public boolean removeBusinessDeptIssue(List idList) { return removeByIds(idList); } @Override - public IPage getBussDeptIssue(BusinessDeptIssueVo pageVo) { + public IPage getBusinessDeptIssue(BusinessDeptIssueVo pageVo) { - IPage page=new Page<>(pageVo.getPage(),pageVo.getPageSize()); + IPage page = new Page<>(); + QueryWrapper wrapper = new QueryWrapper<>(); + //是否分页 + if (pageVo.getPage()!=null && pageVo.getPageSize()!=null){ + page=new Page<>(pageVo.getPage(),pageVo.getPageSize()); - QueryWrapper wrapper = new QueryWrapper<>(); - - if (pageVo.getNumberOrName()!=null){ - wrapper.like("law_number",pageVo.getNumberOrName()) - .or() - .like("law_name",pageVo.getNumberOrName()); - } + }else { + Integer count = businessDeptIssueDao.selectCount(wrapper); + page=new Page<>(0,count,false); + } - if (pageVo.getLawNumber()!=null || pageVo.getProductType()!=null){ - wrapper.like("law_number",pageVo.getLawNumber()) - .or() - .like("law_name",pageVo.getLawName()); - } + //查询条件 + if (pageVo.getIsClose()!=null){ + wrapper.like("is_close",pageVo.getIsClose()); + } - if (pageVo.getResponseDept()!=null){ - wrapper.like("product_type",pageVo.getResponseDept()); - } + if (pageVo.getLawNumber()!=null || pageVo.getLawName()!=null){ + wrapper.like("laws.LAWS_NUMBER",pageVo.getLawNumber()) + .or() + .like("laws.LAWS_NAME",pageVo.getLawName()); + } - page = businessDeptIssueDao.findPage(page, wrapper); + if (pageVo.getProductType()!=null){ + wrapper.like("product_type",pageVo.getProductType()); + } + + if (pageVo.getResponseDept()!=null){ + wrapper.like("response_dept",pageVo.getResponseDept()); + } + + /** + * 导出 + */ + if (pageVo.getIdList()!=null){ + wrapper.in("issue.ID",pageVo.getIdList()); + } + + page = businessDeptIssueDao.findPage(page, wrapper); return page; } @Override - public boolean updateBussDeptIssue(BusinessDeptIssue obj) { + public boolean updateBusinessDeptIssue(BusinessDeptIssue obj) { return this.updateById(obj); } + + @Override + public boolean closeBusinessDeptIssue(List idList){ + List collect = idList.stream() + .map(item -> { + BusinessDeptIssue businessDeptIssue = new BusinessDeptIssue(); + businessDeptIssue.setId(item); + businessDeptIssue.setIsClose("1"); + return businessDeptIssue; + }).collect(Collectors.toList()); + + return this.updateBatchById(collect); + } + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/BusinessDeptIssuempaaer.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/BusinessDeptIssuempaaer.xml index 672fa243..01548dcc 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/BusinessDeptIssuempaaer.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/BusinessDeptIssuempaaer.xml @@ -7,16 +7,16 @@ - - - - - - - - - - + + + + + + + + + + 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 6/7] =?UTF-8?q?=E9=87=8D=E7=82=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=A7=84=E5=88=92=E9=83=A8=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E6=8E=A5=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 @@ + + + + + + + + + + + + + + + + + + + + + + + + From 5a07c4a61664566f33440329265146513d4f81f2 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 12 Nov 2021 10:12:16 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=AF=B9=E6=AF=94excel=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ImportExcelController.java | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java index 0553d92c..61a7187b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java @@ -2,26 +2,19 @@ package com.adc.da.slrs.ImportExcelDatas.controller; import com.adc.da.base.web.BaseController; import com.adc.da.common.ReadExcel; -import com.adc.da.http.ResponseMessage; +import com.adc.da.slrs.ImportExcelDatas.comment.Analysis; +import com.adc.da.slrs.ImportExcelDatas.comment.Contrast; import com.adc.da.slrs.ImportExcelDatas.comment.ExclErrorOut; import com.adc.da.slrs.ImportExcelDatas.comment.ExclExport; import com.adc.da.slrs.ImportExcelDatas.entity.ImportDto; import com.adc.da.slrs.ImportExcelDatas.service.ImportExcelService; -import com.adc.da.slrs.ImportExcelDatas.service.impl.ImportExcelServiceImpl; -import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; -import com.adc.da.slrs.sarPersonalCenter.entity.SarUserStar; -import com.adc.da.slrs.sarPersonalCenter.entity.SarUserStarEO; import com.adc.da.util.exception.AdcDaBaseException; import com.adc.da.util.utils.IOUtils; -import com.adc.da.util.utils.StringUtils; -import com.adc.da.utils.util.BussStandExportUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; @@ -97,7 +90,7 @@ public class ImportExcelController extends BaseController { } - @ApiOperation("从excl中导入标准信息") + @ApiOperation("从excl分解") @PostMapping("/analysisExcl") public void analysisExcl(MultipartFile exclFile,MultipartFile standSort, HttpServletResponse response, HttpServletRequest request) throws IOException { /** @@ -140,10 +133,25 @@ public class ImportExcelController extends BaseController { - @ApiOperation("从excl中导入标准信息") + @ApiOperation("excel表中的信息是否在数据库中存在") @PostMapping("/isExist") public String isExist(MultipartFile exclFile){ return importExcelService.isExist(exclFile); } + @ApiOperation("对比") + @PostMapping("/contrast") + public void contrast(MultipartFile all,MultipartFile excel) throws IOException { + Contrast contrast = new Contrast(); + contrast.run(all,excel); + + } + + + @ApiOperation("根据标准从excl中分解出标准号,类别,年份") + @PostMapping("/analysis") + public void analysis(MultipartFile exclFile,MultipartFile standSort) throws IOException { + Analysis analysis = new Analysis(); + analysis.run(exclFile,standSort); + } }