From 6d80822d594f21b97fbfa6b1d0099cc00de7d281 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 15 Nov 2021 09:57:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E9=97=AE=E9=A2=98=E8=B7=9F?= =?UTF-8?q?=E8=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IImportStandExcelService.java | 14 +++++ .../controller/IssueTrackController.java | 5 +- .../slrs/sarIssueTrack/entity/IssueTrack.java | 5 ++ .../service/IIssueTrackService.java | 3 +- .../service/impl/IssueTrackServiceImpl.java | 51 ++++++++++++------- 5 files changed, 57 insertions(+), 21 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/IImportStandExcelService.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/IImportStandExcelService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/IImportStandExcelService.java new file mode 100644 index 00000000..43fdad64 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/IImportStandExcelService.java @@ -0,0 +1,14 @@ +package com.adc.da.slrs.ImportExcelDatas.service; + +import com.adc.da.slrs.ImportExcelDatas.entity.ImportDto; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.util.List; +import java.util.Map; + +public interface IImportStandExcelService { + + String importStandExcel(MultipartFile file,String standType) throws IOException; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java index d522496f..e8885f95 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java @@ -5,6 +5,7 @@ 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 com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -42,8 +43,8 @@ public class IssueTrackController { @GetMapping @ApiOperation("查询重点标准跟踪清单") - public ResponseMessage> getIssueTrack(IssueTrackVo wrapper){ - List issueTrack = issueTrackService.getIssueTrack(wrapper); + public ResponseMessage> getIssueTrack(IssueTrackVo wrapper){ + IPage issueTrack = issueTrackService.getIssueTrack(wrapper); return Result.success(issueTrack); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java index 026892f5..db9d94e3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java @@ -37,5 +37,10 @@ public class IssueTrack { @TableField("del_flag") private String delFlag; + @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/sarIssueTrack/service/IIssueTrackService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java index ffbf0b8c..54ad466c 100644 --- 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 @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarIssueTrack.service; import com.adc.da.slrs.sarIssueTrack.entity.IssueTrack; import com.adc.da.slrs.sarIssueTrack.entity.IssueTrackVo; +import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.List; @@ -11,7 +12,7 @@ public interface IIssueTrackService { public boolean removeIssueTrack(List idList); - public List getIssueTrack(IssueTrackVo objVo); + public IPage 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 index d9928e54..b1a8b700 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java @@ -6,7 +6,10 @@ 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.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; @@ -14,6 +17,12 @@ import java.util.List; @Service public class IssueTrackServiceImpl extends ServiceImpl implements IIssueTrackService { + + + @Autowired + private IssueTrackDao issueTrackDao; + + @Override public boolean addIssueTrack(IssueTrack obj) { obj.setId(UUIDUtils.randomUUID20()); @@ -27,27 +36,33 @@ public class IssueTrackServiceImpl extends ServiceImpl getIssueTrack(IssueTrackVo objVo) { - List result=new ArrayList<>(); - if (objVo==null){ - result=this.list(); + public IPage getIssueTrack(IssueTrackVo objVo) { + + IPage trackPage = new Page<>(objVo.getPage(), objVo.getPageSize()); + + QueryWrapper wrapper = new QueryWrapper<>(); + + if (objVo.getPage()!=null && objVo.getPageSize()!=null){ + trackPage=new Page<>(objVo.getPage(),objVo.getPageSize()); }else { - 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); + Integer count = issueTrackDao.selectCount(wrapper); + trackPage=new Page<>(0,count,false); } - return result; + if (objVo.getLawId()!=null){ + wrapper.like("law_id",objVo.getLawId()); + } + if (objVo.getLawName()!=null){ + wrapper.like("law_name",objVo.getLawName()); + } + if (objVo.getProductType()!=null){ + wrapper.like("product_type",objVo.getProductType()); + } + + trackPage = issueTrackDao.selectPage(trackPage, wrapper); + + + return trackPage; } @Override