update: 更改演练、会议计划时间精确到时

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/ConferencePlanEntity.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -33,12 +34,14 @@ public class ConferencePlanEntity extends BaseEntity {
     private String theme;
 
     @NotNull
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @ApiModelProperty("会议计划开始时间")
     private Date scheduledStartTime;
 
     @NotNull
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @ApiModelProperty("会议计划结束时间")
     private Date scheduledEndTime;
 

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/RehearsalPlanEntity.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.core.tool.utils.DateUtil;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -34,12 +34,14 @@ public class RehearsalPlanEntity extends BaseEntity {
     private String subject;
 
     @NotNull
-    @JsonFormat(pattern = DateUtil.PATTERN_DATE)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @ApiModelProperty("演练计划开始时间")
     private Date scheduledStartTime;
 
     @NotNull
-    @JsonFormat(pattern = DateUtil.PATTERN_DATE)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @ApiModelProperty("演练计划结束时间")
     private Date scheduledEndTime;
 

hzims-service/safeproduct/src/main/resources/db/2.0.1.sql

@@ -0,0 +1,9 @@
+-- 会议计划表：修改会议计划开始时间、会议计划结束时间字段
+ALTER TABLE hzims_conference_plan
+    MODIFY COLUMN scheduled_start_time datetime NOT NULL COMMENT '会议计划开始时间',
+    MODIFY COLUMN scheduled_end_time datetime NOT NULL COMMENT '会议计划结束时间';
+
+-- 演练计划表：修改演练计划开始时间、演练计划结束时间字段
+ALTER TABLE hzims_rehearsal_plan
+    MODIFY COLUMN scheduled_start_time datetime NOT NULL COMMENT '演练计划开始时间',
+    MODIFY COLUMN scheduled_end_time datetime NOT NULL COMMENT '演练计划结束时间';