feat: 新需求

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/HouseResourceDataCollectionQuery.java

 package com.ruoyi.system.domain.house.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -14,8 +14,8 @@ public class HouseResourceDataCollectionQuery {
 
     private String four;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startDate;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endDate;
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/house/HouseResourceMapper.java

@@ -36,7 +36,7 @@ public interface HouseResourceMapper {
 
     List<HouseResourcePage> selectByIdList(@Param("idList") List<String> idList);
 
-    List<HouseResourceDataCollectionSimpleObject> selectHouseResourceByCreateTime(@Param("query")HouseResourceDataCollectionQuery query);
+    List<HouseResourceDataCollectionSimpleObject> selectHouseResourceByCreateTime(@Param("query") HouseResourceDataCollectionQuery query);
 
-    List<HouseResourceDataCollectionSimpleObject> selectHouseResourceByUpdateTime(@Param("query")HouseResourceDataCollectionQuery query);
+    List<HouseResourceDataCollectionSimpleObject> selectHouseResourceByUpdateTime(@Param("query") HouseResourceDataCollectionQuery query);
 }

ruoyi-system/src/main/resources/mapper/house/HouseResourceMapper.xml

@@ -881,11 +881,11 @@
             <if test="query.four != null and query.four != ''">
                 AND four = #{query.four}
             </if>
-            <if test="startDate != null">
-                AND update_time <![CDATA[ >= ]]> #{startDate}
+            <if test="query.startDate != null">
+                AND update_time <![CDATA[ >= ]]> #{query.startDate}
             </if>
-            <if test="endDate != null">
-                AND update_time <![CDATA[ <= ]]> #{endDate}
+            <if test="query.endDate != null">
+                AND update_time <![CDATA[ <= ]]> #{query.endDate}
             </if>
         </where>
         GROUP BY