From b9434ec80656b16ea66ac9098d7d33b47da04197 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 17 Jan 2024 10:54:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86--=E6=97=B6=E9=97=B4=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ParamsTemplateEOController.java       | 11 ++++++++++-
 .../cert/template/entity/ParamsTemplateEO.java       | 12 ++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java
index 581f6ab09..73b0663b4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java
@@ -43,6 +43,8 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.text.Collator;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -112,7 +114,14 @@ public class ParamsTemplateEOController extends JeroController<ParamsTemplateEO,
 			queryWrapper.lambda().ge(ParamsTemplateEO::getUpdateTime,paramsTemplateEO.getUpdateTimeStart());
 		}
 		if(ObjectUtil.isNotEmpty(paramsTemplateEO.getUpdateTimeEnd())){
-			queryWrapper.lambda().le(ParamsTemplateEO::getUpdateTime,paramsTemplateEO.getUpdateTimeEnd());
+			try {
+				SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
+				SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+				String format = sdf1.format(paramsTemplateEO.getUpdateTimeEnd())+" 23:59:59";
+				queryWrapper.lambda().le(ParamsTemplateEO::getUpdateTime,sdf2.parse(format));
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
 		}
 		Page<ParamsTemplateEO> page = new Page<ParamsTemplateEO>(pageNo, pageSize);
 		IPage<ParamsTemplateEO> pageList = paramsTemplateEOService.page(page, queryWrapper);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java
index c98b63b13..f949624cd 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java
@@ -57,15 +57,15 @@ public class ParamsTemplateEO implements Serializable {
     private java.util.Date updateTime;
 
 	@TableField(exist = false)
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "最新变更时间")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "变更起始时间")
     private java.util.Date updateTimeStart;
 
     @TableField(exist = false)
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "最新变更时间")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "变更结束时间")
     private java.util.Date updateTimeEnd;
 
 	/**所属部门*/