通用时间格式

parent 50fde73c
...@@ -23,11 +23,11 @@ import java.util.List; ...@@ -23,11 +23,11 @@ import java.util.List;
public class PlanResourceTaskGanttVO { public class PlanResourceTaskGanttVO {
@Schema(description = "任务计划最早开始时间") @Schema(description = "任务计划最早开始时间")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
private LocalDateTime earliestTaskStartTime; private LocalDateTime earliestTaskStartTime;
@Schema(description = "最近任务派工截止时间") @Schema(description = "最近任务派工截止时间")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
private LocalDateTime lastTaskAssignmentTime; private LocalDateTime lastTaskAssignmentTime;
@Schema(description = "资源集合") @Schema(description = "资源集合")
...@@ -35,4 +35,4 @@ public class PlanResourceTaskGanttVO { ...@@ -35,4 +35,4 @@ public class PlanResourceTaskGanttVO {
@Schema(description = "任务集合") @Schema(description = "任务集合")
private List<ScheduledTask> tasks; private List<ScheduledTask> tasks;
} }
\ No newline at end of file
...@@ -22,14 +22,14 @@ import java.util.List; ...@@ -22,14 +22,14 @@ import java.util.List;
public class PlanResourceTaskGanttVO1 { public class PlanResourceTaskGanttVO1 {
@Schema(description = "任务计划最早开始时间") @Schema(description = "任务计划最早开始时间")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
private LocalDateTime earliestTaskStartTime; private LocalDateTime earliestTaskStartTime;
@Schema(description = "最近任务派工截止时间") @Schema(description = "最近任务派工截止时间")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
private LocalDateTime lastTaskAssignmentTime; private LocalDateTime lastTaskAssignmentTime;
@Schema(description = "资源任务集合") @Schema(description = "资源任务集合")
private List<SimpleEquipinfo1> resources; private List<SimpleEquipinfo1> resources;
} }
\ No newline at end of file
...@@ -34,11 +34,11 @@ public class ProductGanttVO { ...@@ -34,11 +34,11 @@ public class ProductGanttVO {
private String code; private String code;
@Schema(description = "开始日期") @Schema(description = "开始日期")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
private LocalDateTime startDate; private LocalDateTime startDate;
@Schema(description = "结束日期") @Schema(description = "结束日期")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
private LocalDateTime endDate; private LocalDateTime endDate;
@Schema(description = "车间ID") @Schema(description = "车间ID")
...@@ -63,4 +63,4 @@ public class ProductGanttVO { ...@@ -63,4 +63,4 @@ public class ProductGanttVO {
private String orderCode; private String orderCode;
} }
\ No newline at end of file
...@@ -11,11 +11,11 @@ public class GenVO { ...@@ -11,11 +11,11 @@ public class GenVO {
private String orderId; // 工单ID private String orderId; // 工单ID
private Integer operationId; // 工序ID private Integer operationId; // 工序ID
private Long equipId; // 设备ID private Long equipId; // 设备ID
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
private LocalDateTime startTime; // 实际开始时间 private LocalDateTime startTime; // 实际开始时间
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
private LocalDateTime endTime; // 实际结束时间 private LocalDateTime endTime; // 实际结束时间
private BigDecimal quantity; // 加工数量 private BigDecimal quantity; // 加工数量
private String operationName; // 工序名称 private String operationName; // 工序名称
private String equipName; // 设备名称 private String equipName; // 设备名称
} }
\ No newline at end of file
...@@ -23,11 +23,11 @@ import java.util.List; ...@@ -23,11 +23,11 @@ import java.util.List;
public class PlanResourceTaskGanttVO { public class PlanResourceTaskGanttVO {
@Schema(description = "任务计划最早开始时间") @Schema(description = "任务计划最早开始时间")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
private LocalDateTime earliestTaskStartTime; private LocalDateTime earliestTaskStartTime;
@Schema(description = "最近任务派工截止时间") @Schema(description = "最近任务派工截止时间")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
private LocalDateTime lastTaskAssignmentTime; private LocalDateTime lastTaskAssignmentTime;
@Schema(description = "资源任务集合") @Schema(description = "资源任务集合")
...@@ -35,4 +35,4 @@ public class PlanResourceTaskGanttVO { ...@@ -35,4 +35,4 @@ public class PlanResourceTaskGanttVO {
@Schema(description = "场景id") @Schema(description = "场景id")
private Long sceneId; private Long sceneId;
} }
\ No newline at end of file
...@@ -11,13 +11,13 @@ public class ScheduledTask { ...@@ -11,13 +11,13 @@ public class ScheduledTask {
private String orderId; // 工单ID private String orderId; // 工单ID
private Long operationId; // 工序ID private Long operationId; // 工序ID
private Long equipId; // 设备ID private Long equipId; // 设备ID
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
private LocalDateTime startTime; // 实际开始时间 private LocalDateTime startTime; // 实际开始时间
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
private LocalDateTime endTime; // 实际结束时间 private LocalDateTime endTime; // 实际结束时间
private BigDecimal quantity; // 加工数量 private BigDecimal quantity; // 加工数量
private BigDecimal utilization; // 加工效率 private BigDecimal utilization; // 加工效率
private String routeId; // 工艺路线ID private String routeId; // 工艺路线ID
private String operationName; // 工序名称 private String operationName; // 工序名称
private String equipName; // 设备名称 private String equipName; // 设备名称
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment