From 2c05f5a8456013278895838434150b76b86ae598 Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Thu, 14 Nov 2024 15:45:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E5=BE=8B=E6=B3=95=E8=A7=84=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=AD=9B=E9=80=89=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xyt/controller/SzRuleByLawController.java | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/controller/SzRuleByLawController.java b/src/main/java/com/gunshi/project/xyt/controller/SzRuleByLawController.java
index b3858a2..017369e 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/SzRuleByLawController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/SzRuleByLawController.java
@@ -20,6 +20,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.Serializable;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.Objects;
 
@@ -106,6 +107,7 @@ public class SzRuleByLawController extends AbstractCommonFileController {
     @PostMapping("/page")
     public R<Page<SzRuleByLaw>> page(@RequestBody @Validated SzRuleByLawPage page) {
         LambdaQueryWrapper<SzRuleByLaw> query = Wrappers.lambdaQuery();
+        Calendar calendar=Calendar.getInstance();
 
         if (Objects.nonNull(page.getType())) {
             query.eq(SzRuleByLaw::getType, page.getType());
@@ -127,24 +129,39 @@ public class SzRuleByLawController extends AbstractCommonFileController {
             query.ge(SzRuleByLaw::getAnnouncementDate, page.getStmAd());
         }
 
-        if (Objects.nonNull(page.getEtmAd())) {
-            query.le(SzRuleByLaw::getAnnouncementDate, page.getStmAd());
+        Date etmAd = page.getEtmAd();
+        if (Objects.nonNull(etmAd)) {
+            calendar.setTime(etmAd);
+            calendar.set(Calendar.HOUR,23);
+            calendar.set(Calendar.MINUTE,59);
+            calendar.set(Calendar.SECOND,59);
+            query.le(SzRuleByLaw::getAnnouncementDate, calendar.getTime());
         }
 
         if (Objects.nonNull(page.getStmIm())) {
             query.ge(SzRuleByLaw::getImplementationDate, page.getStmIm());
         }
 
-        if (Objects.nonNull(page.getEtmIm())) {
-            query.le(SzRuleByLaw::getImplementationDate, page.getEtmIm());
+        Date etmIm = page.getEtmIm();
+        if (Objects.nonNull(etmIm)) {
+            calendar.setTime(etmIm);
+            calendar.set(Calendar.HOUR,23);
+            calendar.set(Calendar.MINUTE,59);
+            calendar.set(Calendar.SECOND,59);
+            query.le(SzRuleByLaw::getImplementationDate, calendar.getTime());
         }
 
         if (Objects.nonNull(page.getStmUd())) {
             query.ge(SzRuleByLaw::getUploadDate, page.getStmUd());
         }
 
-        if (Objects.nonNull(page.getEtmUd())) {
-            query.le(SzRuleByLaw::getUploadDate, page.getEtmUd());
+        Date etmUd = page.getEtmUd();
+        if (Objects.nonNull(etmUd)) {
+            calendar.setTime(etmUd);
+            calendar.set(Calendar.HOUR,23);
+            calendar.set(Calendar.MINUTE,59);
+            calendar.set(Calendar.SECOND,59);
+            query.le(SzRuleByLaw::getUploadDate, calendar.getTime());
         }
 
         query.orderByDesc(SzRuleByLaw::getCreateTime);