From d2caae0ea48e173c0e2f46df84a4d2408bf44f7e Mon Sep 17 00:00:00 2001 From: wangxin <19528409042@163.com> Date: Sat, 21 Nov 2026 14:57:00 +0800 Subject: [PATCH] Changes --- .../infra/maint/model/po/AssetInventory.java | 9 ++++----- .../tocc/infra/maint/model/po/Defect.java | 16 ++++++++-------- .../infra/maint/model/po/InspectionRecord.java | 9 ++++----- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/AssetInventory.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/AssetInventory.java index 55bd93e..61ca1d6 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/AssetInventory.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/AssetInventory.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import java.time.LocalDate; import java.time.LocalDateTime; /** @@ -61,8 +60,8 @@ public class AssetInventory { /** 提交时间 */ @Schema(description = "提交时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate submitTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime submitTime; /** 审核人 */ @Schema(description = "审核人") @@ -70,8 +69,8 @@ public class AssetInventory { /** 审核时间 */ @Schema(description = "审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate checkTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime checkTime; /** 审核意见 */ @Schema(description = "审核意见") diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Defect.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Defect.java index cba3c8e..7812e5f 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Defect.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Defect.java @@ -113,8 +113,8 @@ public class Defect { /** 病害提交时间 */ @Schema(description = "病害提交时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate submitTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime submitTime; /** 病害审核人(管理员) */ @Schema(description = "病害审核人(管理员)") @@ -122,8 +122,8 @@ public class Defect { /** 病害审核时间 */ @Schema(description = "病害审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate checkTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime checkTime; /** 病害审核意见 */ @Schema(description = "病害审核意见") @@ -135,8 +135,8 @@ public class Defect { /** 处置结果提交时间 */ @Schema(description = "处置结果提交时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate maintenanceSubmitTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime maintenanceSubmitTime; /** 处置结果审核人(管理员) */ @Schema(description = "处置结果审核人(管理员)") @@ -144,8 +144,8 @@ public class Defect { /** 处置结果审核时间 */ @Schema(description = "处置结果审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate maintenanceCheckTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime maintenanceCheckTime; /** 处置结果审核意见 */ @Schema(description = "处置结果审核意见") diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/InspectionRecord.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/InspectionRecord.java index 87e495d..67b2cdc 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/InspectionRecord.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/InspectionRecord.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import java.time.LocalDate; import java.time.LocalDateTime; /** @@ -45,13 +44,13 @@ public class InspectionRecord { /** 巡查开始时间 */ @Schema(description = "巡查开始时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate inspectionStartTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") + private LocalDateTime inspectionStartTime; /** 巡查结束时间 */ @Schema(description = "巡查结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate inspectionEndTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") + private LocalDateTime inspectionEndTime; /** 巡查轨迹 */ @Schema(description = "巡查轨迹")