From 175f339a53332e3b3be3b4dff940530e5059b40d Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 7 Mar 2025 18:21:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0uptime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/canteen/core/customer/dto/CustInfoParam.java   | 3 +++
 .../src/main/resources/mapper/customer/CustInfoMapper.xml    | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/dto/CustInfoParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/dto/CustInfoParam.java
index c6072fa7..76fc9be9 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/dto/CustInfoParam.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/dto/CustInfoParam.java
@@ -4,6 +4,7 @@ import com.bonus.canteen.core.common.encrypt.LeNiuDecryptDataProcess;
 import com.bonus.canteen.core.common.encrypt.LeNiuDecryptField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -30,6 +31,8 @@ public class CustInfoParam {
    private List<Integer> cardStatusList;
    private LocalDateTime beginOpenCardTime;
    private LocalDateTime endOpenCardTime;
+   @DateTimeFormat(pattern = "yyyy-MM-dd")
+   private LocalDate upTime;
    @ApiModelProperty("个人账户级别 1个人 2部门主账户")
    private Integer custType;
    private String shape;
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustInfoMapper.xml
index c8300bc9..d1ade803 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustInfoMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustInfoMapper.xml
@@ -419,6 +419,11 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="infoParam.upTime != null">
+                <![CDATA[
+                and ci.uptime >= #{infoParam.upTime}
+                ]]>
+            </if>
         </where>
         order by ci.id desc
     </select>

From cf2daeb6701648a32d76039a5a999e870a225ffd Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 7 Mar 2025 18:25:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0uptime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/canteen/core/customer/dto/CustInfoParam.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/dto/CustInfoParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/dto/CustInfoParam.java
index b68b4287..4326d342 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/dto/CustInfoParam.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/dto/CustInfoParam.java
@@ -39,8 +39,6 @@ public class CustInfoParam {
    private String chronicIds;
    private LocalDate birthdayStartTime;
    private LocalDate birthdayEndTime;
-   @DateTimeFormat(pattern = "yyyy-MM-dd")
-   private LocalDate upTime;
    private String keyword;
    private List<Long> placeIdList;
    private List<Integer> healthStateList;