From 3c5f9163a1cbf59bfab3060172bad28f3bee39a0 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Fri, 1 Mar 2024 18:30:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=B0=E5=BD=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4/=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java | 7 +++++++ .../java/com/kms/yxgh/sz/dto/SzYhRecordDetailDto.java | 7 +++++++ sql/sy/v1.2.0/全量脚本/v1.2.0-all.sql | 8 ++++---- sql/sy/v1.2.0/增量脚本/v1.2.0-update.sql | 5 +++++ 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java index bd58f4ff..1c5af9e6 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; @@ -44,6 +45,12 @@ public class DfYhRecordDetailDto { @ApiModelProperty("状态") private String status; + @ApiModelProperty("创建时间") + private Date createTime; + + @ApiModelProperty("最近修改时间") + private Date updateTime; + @ApiModelProperty("养护人员") private List operators; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordDetailDto.java index ac3c459f..1dd079c8 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordDetailDto.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; @@ -50,6 +51,12 @@ public class SzYhRecordDetailDto { @ApiModelProperty("状态") private Long status; + @ApiModelProperty("创建时间") + private Date createTime; + + @ApiModelProperty("最近修改时间") + private Date updateTime; + @ApiModelProperty("养护人员") private List operators; diff --git a/sql/sy/v1.2.0/全量脚本/v1.2.0-all.sql b/sql/sy/v1.2.0/全量脚本/v1.2.0-all.sql index b0cb3dac..d02e08a1 100644 --- a/sql/sy/v1.2.0/全量脚本/v1.2.0-all.sql +++ b/sql/sy/v1.2.0/全量脚本/v1.2.0-all.sql @@ -147,8 +147,8 @@ CREATE TABLE `bs_sgc_df_yhjh` ( CREATE TABLE `bs_sgc_df_yhjl` ( `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防维修养护记录编号', - `DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码', - `PLAN_ID` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '计划代码', + `DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci COMMENT '堤防代码', + `PLAN_ID` varchar(18) COLLATE utf8mb4_general_ci COMMENT '计划代码', `NAME` varchar(100) COLLATE utf8mb4_general_ci COMMENT '名称', `BEFORE` varchar(100) COLLATE utf8mb4_general_ci COMMENT '维护前', `MIDDLE` varchar(100) COLLATE utf8mb4_general_ci COMMENT '维护过程', @@ -433,8 +433,8 @@ CREATE TABLE `bs_sgc_sz_yhjh` ( CREATE TABLE `bs_sgc_sz_yhjl` ( `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸维修养护记录编号', - `WAGA_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '水闸代码', - `PLAN_ID` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '计划代码', + `WAGA_CODE` varchar(18) COLLATE utf8mb4_general_ci COMMENT '水闸代码', + `PLAN_ID` varchar(18) COLLATE utf8mb4_general_ci COMMENT '计划代码', `NAME` varchar(100) COLLATE utf8mb4_general_ci COMMENT '名称', `BEFORE` varchar(100) COLLATE utf8mb4_general_ci COMMENT '维护前', `MIDDLE` varchar(100) COLLATE utf8mb4_general_ci COMMENT '维护过程', diff --git a/sql/sy/v1.2.0/增量脚本/v1.2.0-update.sql b/sql/sy/v1.2.0/增量脚本/v1.2.0-update.sql index f8eb1be3..45f69f30 100644 --- a/sql/sy/v1.2.0/增量脚本/v1.2.0-update.sql +++ b/sql/sy/v1.2.0/增量脚本/v1.2.0-update.sql @@ -1,4 +1,9 @@ SET NAMES utf8mb4; +ALTER TABLE `bs_sgc_df_yhjl` MODIFY COLUMN DIKE_CODE varchar(18) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '堤防代码'; +ALTER TABLE `bs_sgc_df_yhjl` MODIFY COLUMN `PLAN_ID` varchar(18) COLLATE utf8mb4_general_ci COMMENT '计划代码'; +ALTER TABLE `bs_sgc_sz_yhjl` MODIFY COLUMN WAGA_CODE varchar(18) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '水闸代码'; +ALTER TABLE `bs_sgc_sz_yhjl` MODIFY COLUMN `PLAN_ID` varchar(18) COLLATE utf8mb4_general_ci COMMENT '计划代码'; + ALTER TABLE `bs_sgc_df_xsjhjl` ADD `DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码'; ALTER TABLE `bs_sgc_df_xsjh` ADD `DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码'; ALTER TABLE `bs_sgc_df_hdjl` ADD `DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码';