From 0113c5767f04315ac031e356576aa0e7477c3af7 Mon Sep 17 00:00:00 2001 From: liwen Date: Mon, 22 Apr 2024 13:52:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=97=B6=E4=BC=9A=E8=AE=AE=E8=AE=B0=E5=BD=95=E7=9A=84=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E6=97=A0=E6=B3=95=E6=8D=A2=E8=A1=8C=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims/safeproduct/service/impl/ConferenceRecordServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ConferenceRecordServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ConferenceRecordServiceImpl.java index 444952b..fb4fa22 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ConferenceRecordServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ConferenceRecordServiceImpl.java @@ -116,6 +116,9 @@ public class ConferenceRecordServiceImpl extends ServiceImpl list = new ArrayList<>(); if (StringUtils.isNotEmpty(conferenceRecordDetailVO.getImgPath())) { From 9ffcbe15ca5ed491cd1bd1ddd6d067aab250fd7c Mon Sep 17 00:00:00 2001 From: liwen Date: Mon, 22 Apr 2024 14:11:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=BC=94=E7=BB=83?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A1=A8=E3=80=81=E5=9F=B9=E8=AE=AD=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E8=A1=A8=E5=AF=BC=E5=87=BA=E5=86=85=E5=AE=B9=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=8D=A2=E8=A1=8C=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../safeproduct/service/impl/RehearsalRecordServiceImpl.java | 10 ++++++++-- .../hzims/safeproduct/service/impl/TrainRecordServiceImpl.java | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/RehearsalRecordServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/RehearsalRecordServiceImpl.java index a269bf6..a4366b5 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/RehearsalRecordServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/RehearsalRecordServiceImpl.java @@ -141,14 +141,14 @@ public class RehearsalRecordServiceImpl extends ServiceImpl list = new ArrayList<>(); if (StringUtils.isNotEmpty(rehearsalRecordDetailVO.getImgPath())) { String[] imgArr = rehearsalRecordDetailVO.getImgPath().split(","); @@ -162,6 +162,12 @@ public class RehearsalRecordServiceImpl extends ServiceImpl From b7abbf8ce3b8be3edc6dcd0d3a9ec821e0adcfb1 Mon Sep 17 00:00:00 2001 From: liwen Date: Mon, 22 Apr 2024 14:14:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update:=20=E6=9B=B4=E6=94=B9=E6=BC=94?= =?UTF-8?q?=E7=BB=83=E3=80=81=E4=BC=9A=E8=AE=AE=E8=AE=A1=E5=88=92=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=B2=BE=E7=A1=AE=E5=88=B0=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hnac/hzims/safeproduct/entity/ConferencePlanEntity.java | 7 +++++-- .../com/hnac/hzims/safeproduct/entity/RehearsalPlanEntity.java | 8 +++++--- hzims-service/safeproduct/src/main/resources/db/2.0.1.sql | 9 +++++++++ 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 hzims-service/safeproduct/src/main/resources/db/2.0.1.sql diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/ConferencePlanEntity.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/ConferencePlanEntity.java index 914c031..9365a14 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/ConferencePlanEntity.java +++ b/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; diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/RehearsalPlanEntity.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/RehearsalPlanEntity.java index 45acd49..850988d 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/RehearsalPlanEntity.java +++ b/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; diff --git a/hzims-service/safeproduct/src/main/resources/db/2.0.1.sql b/hzims-service/safeproduct/src/main/resources/db/2.0.1.sql new file mode 100644 index 0000000..d66265a --- /dev/null +++ b/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 '演练计划结束时间';