修改时间字段

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/DbUsageRecordController.java

@@ -20,6 +20,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalTime;
 import java.util.Objects;
 
 /**
@@ -118,7 +119,7 @@ public class DbUsageRecordController extends AbstractController {
             queryWrapper.eq(DbUsageRecord::getCollegeId, dbUsageRecordBo.getCollegeId());
         }
         if (Objects.nonNull(dbUsageRecordBo.getStartTime()) && Objects.nonNull(dbUsageRecordBo.getEndTime())) {
-            queryWrapper.between(DbUsageRecord::getStartTime, dbUsageRecordBo.getStartTime(), dbUsageRecordBo.getEndTime());
+            queryWrapper.between(DbUsageRecord::getUsageStartTime, dbUsageRecordBo.getStartTime().atStartOfDay(), dbUsageRecordBo.getEndTime().atTime(LocalTime.MAX));
         }
         //过滤物理删除数据及倒叙
         queryWrapper.orderByDesc(DbUsageRecord::getId);

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/DbUsageRecord.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
@@ -86,10 +87,12 @@ public class DbUsageRecord extends Model<DbUsageRecord> {
     private Integer gasPressure;
 
     @ApiModelProperty("开始时间")
-    private LocalDateTime startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime usageStartTime;
 
     @ApiModelProperty("结束时间")
-    private LocalDateTime endTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime usageEndTime;
 
     @ApiModelProperty("使用图片")
     private String usageImg;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/bo/DbUsageRecordBo.java

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -79,11 +80,19 @@ public class DbUsageRecordBo extends PageQuery implements Serializable {
 
     @ApiModelProperty("开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime startTime;
+    private LocalDateTime usageStartTime;
 
     @ApiModelProperty("结束时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime endTime;
+    private LocalDateTime usageEndTime;
+
+    @ApiModelProperty("开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate startTime;
+
+    @ApiModelProperty("结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate endTime;
 
     @ApiModelProperty("使用图片")
     private String usageImg;

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/DbUsageRecordMapper.xml

@@ -21,8 +21,8 @@
         <result column="operator" property="operator" />
         <result column="phone" property="phone" />
         <result column="gas_pressure" property="gasPressure" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
+        <result column="usage_start_time" property="usageStartTime" />
+        <result column="usage_end_time" property="usageEndTime" />
         <result column="usage_img" property="usageImg" />
         <result column="create_name" property="createName" />
         <result column="create_by" property="createBy" />
@@ -35,7 +35,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, stcok_id, gas_name, usage_amount, level, size, bottle_code, gas_composition, college_id, college_name, subject_id, subject_name, room_num, beacon_tag, operator_id, operator, phone, gas_pressure, start_time, end_time, usage_img, create_name, create_by, create_time, update_name, update_by, update_time, remark
+        id, stcok_id, gas_name, usage_amount, level, size, bottle_code, gas_composition, college_id, college_name, subject_id, subject_name, room_num, beacon_tag, operator_id, operator, phone, gas_pressure, usage_start_time, usage_end_time, usage_img, create_name, create_by, create_time, update_name, update_by, update_time, remark
     </sql>
 
 </mapper>