From 59bd15174310bc8be323bdfe2a81ccaa4a9258b3 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 3 Apr 2023 22:26:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/KcKetangbiaoController.java    |  8 ++++
 .../modules/kc/ktgl/entity/KcKetangbiao.java  | 48 ++++++++++---------
 2 files changed, 33 insertions(+), 23 deletions(-)

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 5b2345a4..f978b36c 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
@@ -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;
@@ -68,6 +70,7 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<KcKetangbiao> queryWrapper = QueryGenerator.initQueryWrapper(kcKetangbiao, req.getParameterMap());
+		queryWrapper.apply(StringUtils.isNotBlank(kcKetangbiao.getYwmc())," (skjs like '%"+kcKetangbiao.getYwmc()+"%' or kcmc like '%"+kcKetangbiao.getYwmc()+"%')");
 		Page<KcKetangbiao> page = new Page<KcKetangbiao>(pageNo, pageSize);
 		IPage<KcKetangbiao> pageList = kcKetangbiaoService.page(page, queryWrapper);
 		return Result.OK(pageList);
@@ -175,4 +178,9 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
         return super.importExcel(request, response, KcKetangbiao.class);
     }
 
+
+
+	//------------------------------yangjun------------------------------
+
+	 // ------------------------------yangjun------------------------------
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java
index 1e1af3c6..cfb08564 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java
@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -36,25 +34,25 @@ public class KcKetangbiao implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
-	/**创建人登录名称*/
-    @ApiModelProperty(value = "创建人登录名称")
-    private java.lang.String createBy;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
-	/**更新人登录名称*/
-    @ApiModelProperty(value = "更新人登录名称")
-    private java.lang.String updateBy;
-	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-	/**所属部门*/
-    @ApiModelProperty(value = "所属部门")
-    private java.lang.String sysOrgCode;
+//	/**创建人登录名称*/
+//    @ApiModelProperty(value = "创建人登录名称")
+//    private java.lang.String createBy;
+//	/**创建日期*/
+//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+//    @DateTimeFormat(pattern="yyyy-MM-dd")
+//    @ApiModelProperty(value = "创建日期")
+//    private java.util.Date createTime;
+//	/**更新人登录名称*/
+//    @ApiModelProperty(value = "更新人登录名称")
+//    private java.lang.String updateBy;
+//	/**更新日期*/
+//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+//    @DateTimeFormat(pattern="yyyy-MM-dd")
+//    @ApiModelProperty(value = "更新日期")
+//    private java.util.Date updateTime;
+//	/**所属部门*/
+//    @ApiModelProperty(value = "所属部门")
+//    private java.lang.String sysOrgCode;
 	/**课程编号*/
 	@Excel(name = "课程编号", width = 15)
     @ApiModelProperty(value = "课程编号")
@@ -240,4 +238,8 @@ public class KcKetangbiao implements Serializable {
 	@Excel(name = "状态", width = 15)
     @ApiModelProperty(value = "状态")
     private java.lang.String zt;
+
+
+    @TableField(exist = false)
+    private java.lang.String ywmc;
 }