From 72727b6fd12770df24152421fb1694ff8ee70e24 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Sun, 9 Apr 2023 16:09:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kc/kcYuyue/controller/KcYuyueController.java      | 11 ++++++++++-
 .../org/jeecg/modules/kc/kcYuyue/entity/KcYuyue.java  | 10 ++++++++++
 .../modules/kc/kcYuyue/mapper/xml/KcYuyueMapper.xml   |  2 +-
 .../kc/ktgl/controller/KcKetangbiaoController.java    |  6 +++---
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcYuyue/controller/KcYuyueController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcYuyue/controller/KcYuyueController.java
index 0b410dc2..c317e22f 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcYuyue/controller/KcYuyueController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcYuyue/controller/KcYuyueController.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;
@@ -112,7 +114,7 @@ public class KcYuyueController extends JeecgController<KcYuyue, IKcYuyueService>
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		kcYuyueService.removeById(id);
-		return Result.OK("取消预约成功!");
+		return Result.OK("删除预约成功!");
 	}
 	
 	/**
@@ -178,6 +180,13 @@ public class KcYuyueController extends JeecgController<KcYuyue, IKcYuyueService>
 		 if(kcYuyue.getIsOrderByNow() != null && kcYuyue.getIsOrderByNow()){
 			 queryWrapper.orderByAsc("ABS(NOW() - str_to_date( CONCAT( kt.skrq, kt.hhks ), '%Y-%m-%d %H%i' ))");
 		 }
+		 queryWrapper.ge(StringUtils.isNotBlank(kcYuyue.getStartTime()),"kt.skrq",kcYuyue.getStartTime());
+		 queryWrapper.le(StringUtils.isNotBlank(kcYuyue.getEndTime()),"kt.skrq",kcYuyue.getEndTime());
+		 queryWrapper.eq(StringUtils.isNotBlank(kcYuyue.getKkdw()),"kt.kkdw",kcYuyue.getKkdw());
+		 queryWrapper.eq(StringUtils.isNotBlank(kcYuyue.getJieci()),"kt.hh",kcYuyue.getJieci());
+		 if(StringUtils.isNotBlank(kcYuyue.getYwmc())){
+			 queryWrapper.apply("kt.kcmc like '%"+kcYuyue.getYwmc()+"%' or kt.skjs like '%"+kcYuyue.getYwmc()+"%'");
+		 }
 		 Page<KcYuyue> page = new Page<KcYuyue>(pageNo, pageSize);
 		 IPage<Map<String,Object>> pageList = kcYuyueService.findTingkeZuJiByPage(page, queryWrapper);
 		 return Result.OK(pageList);
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcYuyue/entity/KcYuyue.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcYuyue/entity/KcYuyue.java
index 87424292..993519c6 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcYuyue/entity/KcYuyue.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcYuyue/entity/KcYuyue.java
@@ -76,4 +76,14 @@ public class KcYuyue implements Serializable {
     @TableField(exist = false)
     private Boolean isOrderByNow;
 
+    @TableField(exist = false)
+    private String startTime;
+    @TableField(exist = false)
+    private String endTime;
+    @TableField(exist = false)
+    private String kkdw;
+    @TableField(exist = false)
+    private String jieci;
+    @TableField(exist = false)
+    private String ywmc;
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcYuyue/mapper/xml/KcYuyueMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcYuyue/mapper/xml/KcYuyueMapper.xml
index 9dbf50b4..1e6e6ae6 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcYuyue/mapper/xml/KcYuyueMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcYuyue/mapper/xml/KcYuyueMapper.xml
@@ -5,7 +5,7 @@
     <select id="findTingkeZuJiByPage" resultType="java.util.Map">
         SELECT
         kt.*,
-        a.id AS yyid
+        a.id AS yyid,a.isdeleted
         FROM
         kc_yuyue a
         LEFT JOIN kc_ketangbiao kt ON a.ketangbiaoid = kt.id
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java
index 67d73cc2..7680aa69 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java
@@ -247,9 +247,9 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
 													  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 													  HttpServletRequest req) {
 
-		 String username = JwtUtil.getUserNameByToken(req);
-		 LoginUser loginUser = commonApi.getUserByName(username);
-		 kcKetangbiao.setUserid(loginUser.getUsername());
+//		 String username = JwtUtil.getUserNameByToken(req);
+//		 LoginUser loginUser = commonApi.getUserByName(username);
+//		 kcKetangbiao.setUserid(loginUser.getUsername());
 //		 QueryWrapper<KcKetangbiao> queryWrapper = QueryGenerator.initQueryWrapper(kcKetangbiao, req.getParameterMap());
 //		 queryWrapper.apply(StringUtils.isNotBlank(kcKetangbiao.getYwmc())," (skjs like '%"+kcKetangbiao.getYwmc()+"%' or kcmc like '%"+kcKetangbiao.getYwmc()+"%')");
 //		 queryWrapper.ne(StringUtils.isNotBlank(kcKetangbiao.getYwskxs()),"skxs",kcKetangbiao.getYwskxs());