From 094a0f31cbcdb27314bac0c1af601e0230a10a3d Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 6 Jul 2022 16:32:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86-=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=E8=A1=A8-?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsOpinionAssessmentResultEOController.java         | 4 ++--
 .../service/ILawsOpinionAssessmentResultEOService.java   | 4 +++-
 .../impl/LawsOpinionAssessmentResultEOServiceImpl.java   | 9 +++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java
index 54e97279b..6d5c5cc27 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java
@@ -66,8 +66,8 @@ public class LawsOpinionAssessmentResultEOController extends JeroController<Laws
 	@AutoLog(value = "法规意见收集-评估结果表-列表查询")
     @ApiOperation(value="法规意见收集-评估结果表-列表查询", notes="法规意见收集-评估结果表-列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<LawsOpinionAssessmentResultEO>> queryList() {
-        List<LawsOpinionAssessmentResultEO> list = lawsOpinionAssessmentResultEOService.queryList();
+	public Result<List<LawsOpinionAssessmentResultEO>> queryList(LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO,HttpServletRequest req,String cut) {
+        List<LawsOpinionAssessmentResultEO> list = lawsOpinionAssessmentResultEOService.queryList(lawsOpinionAssessmentResultEO,req,cut);
         return Result.OK(list);
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java
index 97c166753..cb35be57d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java
@@ -2,6 +2,8 @@ package com.jero.modules.lawsOpinionGather.service;
 
 import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO;
 import com.baomidou.mybatisplus.extension.service.IService;
+
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -57,7 +59,7 @@ public interface ILawsOpinionAssessmentResultEOService extends IService<LawsOpin
 	 *
 	 * @return
 	 */
-    List<LawsOpinionAssessmentResultEO> queryList();
+    List<LawsOpinionAssessmentResultEO> queryList(LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO, HttpServletRequest req,String cut);
 
 	/**
 	 * 批量新增
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
index 8549a230f..f4d361405 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
@@ -1,6 +1,7 @@
 package com.jero.modules.lawsOpinionGather.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO;
 import com.jero.modules.lawsOpinionGather.mapper.LawsOpinionAssessmentResultEOMapper;
@@ -12,6 +13,8 @@ import java.util.List;
 import java.util.Date;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @Description: 法规意见收集-评估结果表
  * @Author: jero-boot
@@ -87,8 +90,10 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
 	 * @return
 	 */
 	@Override
-    public List<LawsOpinionAssessmentResultEO> queryList() {
-        return list();
+    public List<LawsOpinionAssessmentResultEO> queryList(LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO, HttpServletRequest req,String cut) {
+		QueryWrapper<LawsOpinionAssessmentResultEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsOpinionAssessmentResultEO, req.getParameterMap());
+		List<LawsOpinionAssessmentResultEO> list = this.list(queryWrapper);
+		return list;
     }
 
 	@Override