luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户年用水量/剩余用水量计算逻辑优化

Browse Source
This commit is contained in:
蒾酒
2025-01-01 19:44:03 +08:00
parent 84ed8dc31f
commit 40cf501ddf
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/UserIrrigationRecord.java
View File

@ -75,13 +75,13 @@ public class UserIrrigationRecord extends BaseEntity
/** 开泵时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "开泵时间", width = 30, dateFormat = "yyyy-MM-dd")
@Excel(name = "开泵时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("开泵时间")
private Date startTime;
/** 关泵时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "关泵时间", width = 30, dateFormat = "yyyy-MM-dd")
@Excel(name = "关泵时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("关泵时间")
private Date endTime;
@ -96,8 +96,8 @@ public class UserIrrigationRecord extends BaseEntity
private Integer unit;
/** 灌溉上报时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "灌溉上报时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "灌溉上报时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("灌溉上报时间")
private Date lastTime;