From f2cc8f37eac3c31a70dc2aa0ae5803f6d6f263e6 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 26 Jun 2024 11:48:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=8D=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E5=BA=93=E6=94=AF=E6=8C=81=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsEvaluationNotMetController.java        | 18 ++++++++++++------
 .../ILawsEvaluationNotMetLibraryService.java   |  5 +++--
 ...LawsEvaluationNotMetLibraryServiceImpl.java | 13 ++++++++-----
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsEvaluationNotMetController.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsEvaluationNotMetController.java
index 6f846ade..b8bf6bc6 100644
--- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsEvaluationNotMetController.java
+++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsEvaluationNotMetController.java
@@ -48,10 +48,16 @@ public class LawsEvaluationNotMetController extends JeroController<LawsEvaluatio
 	@ApiOperation(value="不符合项-分页列表查询", notes="不符合项-分页列表查询")
 	@GetMapping(value = "/page")
 	@RequiresPermissions("lawsEvaluationNotMet:search")
-	public Result<IPage<LawsEvaluationNotMetLibrary>> queryPageList(LawsEvaluationNotMetLibrary lawsEvaluationNotMet,
-															 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
-		IPage<LawsEvaluationNotMetLibrary> pageList = lawsEvaluationNotMetLibraryService.queryPage(lawsEvaluationNotMet, pageNo, pageSize);
+	public Result<IPage<LawsEvaluationNotMetLibrary>> queryPageList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+															 		@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+															 LawsEvaluationNotMetLibrary lawsEvaluationNotMet, HttpServletRequest req) {
+		if (pageNo == null) {
+			pageNo = 1;
+		}
+		if (pageSize == null) {
+			pageSize = 10;
+		}
+		IPage<LawsEvaluationNotMetLibrary> pageList = lawsEvaluationNotMetLibraryService.queryPage(lawsEvaluationNotMet, pageNo, pageSize, req);
 		return Result.OK(pageList);
 	}
 
@@ -95,8 +101,8 @@ public class LawsEvaluationNotMetController extends JeroController<LawsEvaluatio
 	@ApiOperation(value="不符合项-导出", notes="项目库-导出")
 	@RequiresPermissions("lawsEvaluationNotMet:export")
     @GetMapping(value = "/exportXls")
-    public void exportXls(HttpServletResponse response, LawsEvaluationNotMetLibrary lawsEvaluationNotMet) {
-		lawsEvaluationNotMetLibraryService.export(response, lawsEvaluationNotMet,  "不符合项", "不符合项");
+    public void exportXls(HttpServletResponse response, LawsEvaluationNotMetLibrary lawsEvaluationNotMet, HttpServletRequest req) {
+		lawsEvaluationNotMetLibraryService.export(response, lawsEvaluationNotMet,  "不符合项", "不符合项", req);
     }
 
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsEvaluationNotMetLibraryService.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsEvaluationNotMetLibraryService.java
index 806162c8..1d1b5281 100644
--- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsEvaluationNotMetLibraryService.java
+++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsEvaluationNotMetLibraryService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibrary;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -22,7 +23,7 @@ public interface ILawsEvaluationNotMetLibraryService extends IService<LawsEvalua
      * @param pageSize
      * @return
      */
-    IPage<LawsEvaluationNotMetLibrary> queryPage(LawsEvaluationNotMetLibrary lawsEvaluationNotMet, Integer pageNo, Integer pageSize);
+    IPage<LawsEvaluationNotMetLibrary> queryPage(LawsEvaluationNotMetLibrary lawsEvaluationNotMet, Integer pageNo, Integer pageSize, HttpServletRequest req);
 
     /**
      * 批量关闭
@@ -38,5 +39,5 @@ public interface ILawsEvaluationNotMetLibraryService extends IService<LawsEvalua
      * @param fileName
      * @param sheetName
      */
-    void export(HttpServletResponse response, LawsEvaluationNotMetLibrary lawsEvaluationNotMet, String fileName, String sheetName);
+    void export(HttpServletResponse response, LawsEvaluationNotMetLibrary lawsEvaluationNotMet, String fileName, String sheetName, HttpServletRequest req);
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
index d1746402..71d5e0c0 100644
--- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
@@ -7,12 +7,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibrary;
 import com.jero.modules.assessmentLibrary.mapper.LawsEvaluationNotMetLibraryMapper;
 import com.jero.modules.assessmentLibrary.service.ILawsEvaluationNotMetLibraryService;
 import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardPlanVo;
 import com.jero.modules.projectLibrary.common.AssessCommon;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.catalina.connector.Request;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.jeecgframework.poi.excel.ExcelExportUtil;
@@ -20,6 +22,7 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
@@ -40,8 +43,8 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl<LawsEval
     private LawsEvaluationNotMetLibraryMapper notMetMapper;
 
     @Override
-    public IPage<LawsEvaluationNotMetLibrary> queryPage(LawsEvaluationNotMetLibrary lawsEvaluationNotMet, Integer pageNo, Integer pageSize) {
-        QueryWrapper<LawsEvaluationNotMetLibrary> queryWrapper = new QueryWrapper<>();
+    public IPage<LawsEvaluationNotMetLibrary> queryPage(LawsEvaluationNotMetLibrary lawsEvaluationNotMet, Integer pageNo, Integer pageSize, HttpServletRequest req) {
+        QueryWrapper<LawsEvaluationNotMetLibrary> queryWrapper = QueryGenerator.initQueryWrapper(lawsEvaluationNotMet, req.getParameterMap());
         queryWrapper.like(StringUtils.isNotBlank(lawsEvaluationNotMet.getStandardNumber()),
                 "d.standard_number", lawsEvaluationNotMet.getStandardNumber());
         queryWrapper.like(StringUtils.isNotBlank(lawsEvaluationNotMet.getStandardName()),
@@ -78,15 +81,15 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl<LawsEval
     }
 
     @Override
-    public void export(HttpServletResponse response, LawsEvaluationNotMetLibrary lawsEvaluationNotMet, String fileName, String sheetName) {
+    public void export(HttpServletResponse response, LawsEvaluationNotMetLibrary lawsEvaluationNotMet, String fileName, String sheetName, HttpServletRequest req) {
         try {
             // 获取数据
-            IPage<LawsEvaluationNotMetLibrary> lawsEvaluationNotMets = this.queryPage(lawsEvaluationNotMet, 1, Integer.MAX_VALUE);
+            IPage<LawsEvaluationNotMetLibrary> lawsEvaluationNotMets = this.queryPage(lawsEvaluationNotMet, 1, Integer.MAX_VALUE, req);
             List<LawsEvaluationNotMetLibrary> records = lawsEvaluationNotMets.getRecords();
 
             // 设置导出参数
             ExportParams exportParams = new ExportParams(null, sheetName); // 可以为标题添加更多的配置
-            Workbook workbook = ExcelExportUtil.exportExcel(exportParams, EnterpriseStandardPlanVo.class, records);
+            Workbook workbook = ExcelExportUtil.exportExcel(exportParams, LawsEvaluationNotMetLibrary.class, records);
 
             // 设置响应头和内容类型
             response.setContentType("application/vnd.ms-excel;charset=UTF-8"); // 显式设置字符编码