重点问题跟踪

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

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<List<IssueTrack>> getIssueTrack(IssueTrackVo wrapper){
+    public ResponseMessage<IPage<IssueTrack>> getIssueTrack(IssueTrackVo wrapper){
-        List<IssueTrack> issueTrack = issueTrackService.getIssueTrack(wrapper);
+        IPage<IssueTrack> issueTrack = issueTrackService.getIssueTrack(wrapper);
         return Result.success(issueTrack);
     }
 

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

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<String> idList);
 
-    public List<IssueTrack> getIssueTrack(IssueTrackVo objVo);
+    public IPage<IssueTrack> getIssueTrack(IssueTrackVo objVo);
 
     public boolean updateIssueTrack(IssueTrack obj);
 }

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<IssueTrackDao, IssueTrack> 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<IssueTrackDao, IssueTrack
     }
 
     @Override
-    public List<IssueTrack> getIssueTrack(IssueTrackVo objVo) {
+    public IPage<IssueTrack> getIssueTrack(IssueTrackVo objVo) {
-        List<IssueTrack> result=new ArrayList<>();
+
-        if (objVo==null){
+        IPage<IssueTrack> trackPage = new Page<>(objVo.getPage(), objVo.getPageSize());
-            result=this.list();
+
+        QueryWrapper<IssueTrack> wrapper = new QueryWrapper<>();
+
+        if (objVo.getPage()!=null && objVo.getPageSize()!=null){
+            trackPage=new Page<>(objVo.getPage(),objVo.getPageSize());
         }else {
-            QueryWrapper<IssueTrack> wrapper = new QueryWrapper<>();
+            Integer count = issueTrackDao.selectCount(wrapper);
-
+            trackPage=new Page<>(0,count,false);
-            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;
+        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