From 7302e3c9e686ab0d404e936e7e324b314deca1b3 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期日, 22 九月 2024 19:50:44 +0800
Subject: [PATCH] 查询条件

---
 src/main/java/com/mzl/flower/service/point/CustomerPointService.java    |    8 ++++++++
 src/main/resources/mapper/point/CustomerPointMapper.xml                 |   10 ++++++++++
 src/main/java/com/mzl/flower/dto/request/point/QueryPointDetailDTO.java |   14 ++++++++++++++
 3 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/request/point/QueryPointDetailDTO.java b/src/main/java/com/mzl/flower/dto/request/point/QueryPointDetailDTO.java
index f236ea1..1d27807 100644
--- a/src/main/java/com/mzl/flower/dto/request/point/QueryPointDetailDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/point/QueryPointDetailDTO.java
@@ -4,6 +4,7 @@
 import lombok.Data;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 @Data
 public class QueryPointDetailDTO {
@@ -25,4 +26,17 @@
 
     @ApiModelProperty(hidden = true)
     private String userId;
+
+    @ApiModelProperty("yyyy-MM-dd HH:mm:ss")
+    private String createTimeStartStr;
+
+    @ApiModelProperty("yyyy-MM-dd HH:mm:ss")
+    private String createTimeEndStr;
+
+
+    @ApiModelProperty(hidden = true)
+    private LocalDateTime createTimeStart;
+
+    @ApiModelProperty(hidden = true)
+    private LocalDateTime createTimeEnd;
 }
diff --git a/src/main/java/com/mzl/flower/service/point/CustomerPointService.java b/src/main/java/com/mzl/flower/service/point/CustomerPointService.java
index 8223dd0..9950f12 100644
--- a/src/main/java/com/mzl/flower/service/point/CustomerPointService.java
+++ b/src/main/java/com/mzl/flower/service/point/CustomerPointService.java
@@ -15,6 +15,8 @@
 import com.mzl.flower.mapper.point.CustomerPointDetailMapper;
 import com.mzl.flower.mapper.point.CustomerPointMapper;
 import com.mzl.flower.service.BaseService;
+import com.mzl.flower.utils.DateUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -47,6 +49,12 @@
     }
 
     public  Page<CustomerPointDetailDTO> queryCustomerDetails(QueryPointDetailDTO dto, Page page) {
+        if(StringUtils.isNotBlank(dto.getCreateTimeStartStr())){
+            dto.setCreateTimeStart(DateUtils.dateTimeStringToLocalDateTime(dto.getCreateTimeStartStr()));
+        }
+        if(StringUtils.isNotBlank(dto.getCreateTimeEndStr())){
+            dto.setCreateTimeEnd(DateUtils.dateTimeStringToLocalDateTime(dto.getCreateTimeEndStr()));
+        }
         List<CustomerPointDetailDTO> list = customerPointMapper.queryCustomerDetails(dto, page);
         page.setRecords(list);
 
diff --git a/src/main/resources/mapper/point/CustomerPointMapper.xml b/src/main/resources/mapper/point/CustomerPointMapper.xml
index a4647e2..b6bcd4e 100644
--- a/src/main/resources/mapper/point/CustomerPointMapper.xml
+++ b/src/main/resources/mapper/point/CustomerPointMapper.xml
@@ -51,6 +51,16 @@
         <if test="dto.remarks!=null and dto.remarks != null">
             and t.remarks like CONCAT('%',#{dto.remarks},'%')
         </if>
+        <if test="dto.createTimeStart!=null">
+            <![CDATA[
+               AND t.create_time >= #{dto.createTimeStart}
+            ]]>
+        </if>
+        <if test="dto.createTimeEnd!=null ">
+            <![CDATA[
+               AND t.create_time <= #{dto.createTimeEnd}
+            ]]>
+        </if>
         order by t.create_time desc
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3