diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/DepartmentCostImport.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/DepartmentCostImport.java index 47dc664..273834a 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/DepartmentCostImport.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/DepartmentCostImport.java @@ -43,7 +43,7 @@ public class DepartmentCostImport { @ExcelProperty(index = 3) @NotNull(message = "部门人数不能为空") @Positive(message = "部门人数必须为正数") - private Long personCount; + private Integer personCount; /** 归属公司 */ @ExcelProperty(index = 4) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/GardenWasteRecordImport.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/GardenWasteRecordImport.java index 4bc508b..fe373a3 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/GardenWasteRecordImport.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/GardenWasteRecordImport.java @@ -16,6 +16,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.math.BigDecimal; +import java.time.LocalDate; import java.util.Date; /** @@ -33,7 +34,7 @@ public class GardenWasteRecordImport { @ExcelProperty(index = 0) @JsonFormat(pattern = "yyyy-MM-dd") @NotNull(message = "运输日期不能为空") - private Date transportDate; + private LocalDate transportDate; /** 废弃物类型(如渣土、树枝等) */ @ExcelProperty(index = 1) @@ -58,7 +59,7 @@ public class GardenWasteRecordImport { @NotNull(message = "运输次数不能为空") @Positive(message = "运输次数必须为正整数") @Max(value = 999, message = "运输次数最大值为999") - private Long transportTimes; + private Integer transportTimes; /** 总费用(元) */ @ExcelProperty(index = 5) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/MechanicalCostImport.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/MechanicalCostImport.java index 6a12bfd..ea73b37 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/MechanicalCostImport.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/MechanicalCostImport.java @@ -17,6 +17,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.math.BigDecimal; +import java.time.LocalDate; import java.util.Date; /** @@ -71,13 +72,13 @@ public class MechanicalCostImport { @ExcelProperty(index = 7) @NotNull(message = "数量不能为空") @Positive(message = "数量必须为正整数") - private Long quantity; + private Integer quantity; /** 开始使用时间 */ @ExcelProperty(index = 8) @JsonFormat(pattern = "yyyy-MM-dd") @NotNull(message = "开始使用时间不能为空") - private Date startUseTime; + private LocalDate startUseTime; /** 使用年限 */ @ExcelProperty(index = 9) @@ -85,8 +86,13 @@ public class MechanicalCostImport { @Positive(message = "使用年限必须为正整数") private Long serviceLife; + /** + * 结束使用时间 + */ + private LocalDate endUseTime; + /** 状态(0正常 1停用) */ - private Long status; + private Integer status; @ExcelProperty(index = 10) @NotNull(message = "当前状态不能为空") @@ -121,7 +127,7 @@ public class MechanicalCostImport { * 2. 修改 status(数字状态)时,自动同步 statusTxt(文本状态) * 保持双向联动:改数字→更文本,改文本→更数字 */ - public void setStatus(Long status) { + public void setStatus(Integer status) { this.status = status; // 先赋值数字状态 this.statusTxt = parseTxtFromStatus(status); // 同步文本状态 } @@ -129,7 +135,7 @@ public class MechanicalCostImport { /** * 辅助方法:将状态文本转为数字状态 */ - private Long parseStatusFromTxt(String statusTxt) { + private Integer parseStatusFromTxt(String statusTxt) { if (statusTxt == null || statusTxt.trim().isEmpty()) { this.statusTxt = "未知状态"; // 空文本兜底 return null; @@ -137,8 +143,8 @@ public class MechanicalCostImport { String trimmedTxt = statusTxt.trim(); // 支持多文本映射(兼容 Excel 中可能的不同写法) return switch (trimmedTxt) { - case "在用", "正常", "0" -> 0L; - case "报废", "停用", "1" -> 1L; + case "在用", "正常", "0" -> 0; + case "报废", "停用", "1" -> 1; default -> { this.statusTxt = "未知状态"; // 非法文本兜底 yield null; // 非法状态返回 null,后续可做校验 @@ -149,7 +155,7 @@ public class MechanicalCostImport { /** * 辅助方法:将数字状态转为文本状态 */ - private String parseTxtFromStatus(Long status) { + private String parseTxtFromStatus(Integer status) { if (status == null) { return "未知状态"; } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/RentalMechanicalCostImport.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/RentalMechanicalCostImport.java index 205950a..e8a01a0 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/RentalMechanicalCostImport.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/RentalMechanicalCostImport.java @@ -16,6 +16,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.math.BigDecimal; +import java.time.LocalDate; import java.util.Date; /** @@ -65,20 +66,20 @@ public class RentalMechanicalCostImport { @ExcelProperty(index = 6) @NotNull(message = "数量不能为空") @Positive(message = "数量必须为正整数") - private Long quantity; + private Integer quantity; /** 开始使用时间 */ @ExcelProperty(index = 7) @JsonFormat(pattern = "yyyy-MM-dd") @NotNull(message = "开始使用时间不能为空") - private Date startUseTime; + private LocalDate startUseTime; /** 使用时长(天) */ @ExcelProperty(index = 8) @NotNull(message = "使用时长不能为空") @Positive(message = "使用时长必须为正整数") @Max(value = 3650, message = "使用时长最大值为3650") - private Long useDuration; + private Integer useDuration; /** 归属公司 */ @ExcelProperty(index = 9) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostRespVO.java index 87a48b1..7ab4989 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostRespVO.java @@ -3,10 +3,12 @@ package com.zteits.urbanops.module.garden.controller.admin.mechanicalcost.vo; import cn.hutool.core.annotation.Alias; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fhs.core.trans.anno.Trans; import com.fhs.core.trans.constant.TransType; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.time.LocalDate; @@ -60,6 +62,8 @@ public class MechanicalCostRespVO { @Schema(description = "开始使用时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("开始使用时间") + @JsonFormat(pattern = "yyyy-MM-dd", shape = JsonFormat.Shape.STRING) + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate startUseTime; @Schema(description = "使用年限") @@ -68,6 +72,8 @@ public class MechanicalCostRespVO { @Schema(description = "结束使用时间") @ExcelProperty("结束使用时间") + @JsonFormat(pattern = "yyyy-MM-dd", shape = JsonFormat.Shape.STRING) + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate endUseTime; @Schema(description = "归属公司", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/vo/WasteRecordRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/vo/WasteRecordRespVO.java index 3f95e3c..0e704b0 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/vo/WasteRecordRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/vo/WasteRecordRespVO.java @@ -3,10 +3,12 @@ package com.zteits.urbanops.module.garden.controller.admin.wasterecord.vo; import cn.hutool.core.annotation.Alias; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fhs.core.trans.anno.Trans; import com.fhs.core.trans.constant.TransType; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.time.LocalDate; @@ -24,6 +26,8 @@ public class WasteRecordRespVO { @Schema(description = "运输日期", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("运输日期") + @JsonFormat(pattern = "yyyy-MM-dd", shape = JsonFormat.Shape.STRING) + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate transportDate; @Schema(description = "废弃物类型(如渣土、树枝等)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")