From 18db0b5056b917e4b6f802f75de89c5bceb43637 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 8 Jan 2024 08:23:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/KcGongkaikeController.java     | 21 ++++++++++++++++---
 .../kc/kcGongkaike/entity/KcGongkaike.java    |  2 ++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/controller/KcGongkaikeController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/controller/KcGongkaikeController.java
index 61b943c3..5062befe 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/controller/KcGongkaikeController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/controller/KcGongkaikeController.java
@@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -22,6 +24,8 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig;
 import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService;
+import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
+import org.jeecg.modules.kc.kcXqxnHistory.service.IKcXqxnHistoryService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -55,6 +59,9 @@ public class KcGongkaikeController extends JeecgController<KcGongkaike, IKcGongk
 
 	 @Autowired
 	 private IKcSysConfigService kcSysConfigService;
+
+	 @Autowired
+	 private IKcXqxnHistoryService kcXqxnHistoryService;
 	/**
 	 * 分页列表查询
 	 *
@@ -181,10 +188,18 @@ public class KcGongkaikeController extends JeecgController<KcGongkaike, IKcGongk
 													 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 													 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 													 HttpServletRequest req) {
-		 KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
+		String xnxq = kcGongkaike.getXnxq();
+
 		 QueryWrapper<KcGongkaike> queryWrapper = QueryGenerator.initQueryWrapper(kcGongkaike, req.getParameterMap());
-		 queryWrapper.ge("rq",kcSysConfig.getBxqkssj());
-		 queryWrapper.le("rq",kcSysConfig.getBxqjssj());
+		 if(StringUtils.isEmpty(xnxq)){
+		 	KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
+			 queryWrapper.ge("rq",kcSysConfig.getBxqkssj());
+			 queryWrapper.le("rq",kcSysConfig.getBxqjssj());
+		 }else{QueryWrapper<KcXqxnHistory> kcXqxnHistoryQueryWrapper = new QueryWrapper<>();
+			 kcXqxnHistoryQueryWrapper.eq("title",xnxq);
+			 KcXqxnHistory KcXqxnHistory = kcXqxnHistoryService.getOne(kcXqxnHistoryQueryWrapper);queryWrapper.ge("rq",KcXqxnHistory.getStartTime());
+			 queryWrapper.le("rq",KcXqxnHistory.getEndTime());
+		 }
 		 Page<KcGongkaike> page = new Page<KcGongkaike>(pageNo, pageSize);
 		 IPage<KcGongkaike> pageList = kcGongkaikeService.getIndexList(page, queryWrapper);
 		 return Result.OK(pageList);
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/entity/KcGongkaike.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/entity/KcGongkaike.java
index 141f9926..dbe66494 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/entity/KcGongkaike.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/entity/KcGongkaike.java
@@ -116,5 +116,7 @@ public class KcGongkaike implements Serializable {
 
 	@TableField(exist = false)
 	private String logcount;
+	@TableField(exist = false)
+	private String xnxq;
 
 }