diff --git a/src/main/java/com/gunshi/project/hsz/controller/XlPlanController.java b/src/main/java/com/gunshi/project/hsz/controller/XlPlanController.java index d85c9b8..ec35d69 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/XlPlanController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/XlPlanController.java @@ -1,13 +1,9 @@ package com.gunshi.project.hsz.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; -import com.gunshi.project.hsz.entity.so.ByLogPageSo; import com.gunshi.project.hsz.entity.so.XlPlanPageSo; -import com.gunshi.project.hsz.model.ByLog; -import com.gunshi.project.hsz.model.ByLogDetail; import com.gunshi.project.hsz.model.XlPlan; import com.gunshi.project.hsz.service.FileAssociationsService; import com.gunshi.project.hsz.service.XlPlanService; diff --git a/src/main/java/com/gunshi/project/hsz/model/XlPlan.java b/src/main/java/com/gunshi/project/hsz/model/XlPlan.java index 4c811e1..61cbc7b 100644 --- a/src/main/java/com/gunshi/project/hsz/model/XlPlan.java +++ b/src/main/java/com/gunshi/project/hsz/model/XlPlan.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.gunshi.core.dateformat.DateFormatString; import com.gunshi.project.hsz.validate.markers.Insert; import com.gunshi.project.hsz.validate.markers.Update; @@ -13,6 +15,7 @@ import lombok.Data; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.Date; import java.util.List; /** @@ -27,6 +30,7 @@ public class XlPlan { * 主键ID */ @TableId("id") + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** @@ -51,7 +55,7 @@ public class XlPlan { @TableField("plan_date") @Schema(description = "计划年份/月份") @NotNull(message = "计划年份/月份请选择",groups = {Insert.class, Update.class}) - private LocalDateTime planDate; + private String planDate; /** * 灌溉计划供水量(万) @@ -73,7 +77,7 @@ public class XlPlan { @TableField("plan_begin") @Schema(description = "计划开始日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private LocalDateTime planBegin; + private Date planBegin; /** * 计划结束日期 @@ -81,7 +85,7 @@ public class XlPlan { @TableField("plan_end") @Schema(description = "计划结束日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private LocalDateTime planEnd; + private Date planEnd; /** * 计划编制单位 @@ -96,13 +100,13 @@ public class XlPlan { @TableField("bz_date") @Schema(description = "编制日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private LocalDateTime bzDate; + private Date bzDate; @TableField("fill_date") @Schema(description = "填报时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private LocalDateTime fillDate; + private Date fillDate; /** * 说明