From a5f174eac955c4b06ca676b680d04d97a2b0f144 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 28 Jul 2023 06:50:23 +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

---
 .../kc/grab/imports/controller/XxhbtkxxController.java    | 5 ++++-
 .../jeecg/modules/kc/grab/imports/entity/Xxhbtkxx.java    | 3 +++
 .../modules/kc/grab/imports/mapper/xml/XxhbtkxxMapper.xml | 8 ++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/controller/XxhbtkxxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/controller/XxhbtkxxController.java
index d34fe393..a341aa4d 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/controller/XxhbtkxxController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/controller/XxhbtkxxController.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;
@@ -67,7 +69,8 @@ public class XxhbtkxxController extends JeecgController<Xxhbtkxx, IXxhbtkxxServi
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<Xxhbtkxx> queryWrapper = QueryGenerator.initQueryWrapper(xxhbtkxx, req.getParameterMap());
+		QueryWrapper<Xxhbtkxx> queryWrapper = QueryGenerator.initQueryWrapper("a",xxhbtkxx, req.getParameterMap());
+		queryWrapper.eq(StringUtils.isNotBlank(xxhbtkxx.getXqxn()),"b.title",xxhbtkxx.getXqxn());
 		Page<Xxhbtkxx> page = new Page<Xxhbtkxx>(pageNo, pageSize);
 		IPage<Xxhbtkxx> pageList = xxhbtkxxService.page(page, queryWrapper);
 		return Result.OK(pageList);
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbtkxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbtkxx.java
index d828a062..e70e1b9d 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbtkxx.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbtkxx.java
@@ -136,4 +136,7 @@ public class Xxhbtkxx implements Serializable {
     private java.lang.String tklx;
     @TableField(exist = false)
     private Integer mysqlnum;
+    @TableField(exist = false)
+    private String xqxn;
+
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkxxMapper.xml
index 5163576a..7cfc7987 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkxxMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbtkxxMapper.xml
@@ -17,4 +17,12 @@
     <select id="getSumnum" resultType="org.jeecg.modules.kc.grab.imports.entity.Xxhbtkxx">
         select count(*) as mysqlnum from xxhbtkxx
     </select>
+
+
+    <select id="selectPage" resultType="org.jeecg.modules.kc.grab.imports.entity.Xxhbtkxx">
+        select a.*,b.title as xqxn from xxhbtkxx a
+        LEFT JOIN kc_xqxn_history b on a.SKRQ >= b.start_time + '' and a.SKRQ &lt;= b.end_time +''
+        ${ew.customSqlSegment}
+
+    </select>
 </mapper>
\ No newline at end of file