From a126ec2a7fbac5ed80b9370df592a8f6d593c9f7 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 23 Nov 2022 13:31:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcTripReportRecordDTO.java | 18 ++++++ .../epmet/dto/form/IcYtTripReportFormDTO.java | 40 ++++++------ .../entity/IcTripReportRecordEntity.java | 16 +++++ .../V0.0.92__alter_ic_trip_report.sql | 63 +++++++++++++++++++ 4 files changed, 117 insertions(+), 20 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.92__alter_ic_trip_report.sql diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 19cd71a0a5..d3ff5c8533 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -411,6 +411,16 @@ public class IcTripReportRecordDTO implements Serializable { */ @ExcelIgnore private String viaCounty; + /** + * 编码【烟台】 + */ + @ExcelIgnore + private String viaCode; + /** + * 编码全路径【烟台】 + */ + @ExcelIgnore + private String viaPathCode; /** * 途经地区全拼 */ @@ -431,6 +441,14 @@ public class IcTripReportRecordDTO implements Serializable { */ @ExcelIgnore private String registeredResidenceAddress; + /** + * 编码【烟台】 + */ + private String registeredResidenceCode; + /** + * 编码全路径【烟台】 + */ + private String registeredResidencePathCode; /** * 是否带车 是/否 【烟台】 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcYtTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcYtTripReportFormDTO.java index a3872b4926..52989c13b4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcYtTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcYtTripReportFormDTO.java @@ -68,11 +68,13 @@ public class IcYtTripReportFormDTO implements Serializable { /** * 现居地名称eg:山东省青岛市黄岛区玫瑰山路社区 */ + @NotBlank(message = "现居地不能为空", groups = {YtAdd.class}) private String presentAddress; /** * 详细地址 */ + @NotBlank(message = "现居地详细地址不能为空", groups = {YtAdd.class}) private String detailAddress; /** @@ -88,6 +90,7 @@ public class IcYtTripReportFormDTO implements Serializable { /** * 来源地区地址 */ + @NotBlank(message = "来自地区不能为空", groups = {YtAdd.class}) private String sourceAddress; /** @@ -97,13 +100,6 @@ public class IcYtTripReportFormDTO implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd") private Date arriveDate; - /** - * 离开日期 - */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date leaveDate; - /** * 备注信息 */ @@ -152,19 +148,6 @@ public class IcYtTripReportFormDTO implements Serializable { * 通知内容 */ private String content = ""; - - /** - * 交通方式，来源字典表(traffic_type) - */ - private String trafficType; - /** - * 其他返回方式，交通方式为其他时此列需要有值 - */ - private String trafficTypeExplain; - /** - * 来源地详细信息 source_address字段的说明 - */ - private String sourceDetailAddress; /** * 核酸检测报告异常 是/否【烟台】 */ @@ -193,6 +176,14 @@ public class IcYtTripReportFormDTO implements Serializable { * 途经县区【烟台】 */ private String viaCounty; + /** + * 编码【烟台】 + */ + private String viaCode; + /** + * 编码全路径【烟台】 + */ + private String viaPathCode; /** * 同行人员【烟台】 */ @@ -205,6 +196,14 @@ public class IcYtTripReportFormDTO implements Serializable { * 户籍地详细【烟台】 */ private String registeredResidenceAddress; + /** + * 编码【烟台】 + */ + private String registeredResidenceCode; + /** + * 编码全路径【烟台】 + */ + private String registeredResidencePathCode; /** * 是否带车 是/否 【烟台】 */ @@ -260,6 +259,7 @@ public class IcYtTripReportFormDTO implements Serializable { /** * 来烟方式【烟台】 */ + @NotBlank(message = "返回方式不能为空", groups = {YtAdd.class}) private String comeMode; /** * 班次【烟台】 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index dcb1c01e0b..d7eb3e7e9a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -208,6 +208,14 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { * 途经县区【烟台】 */ private String viaCounty; + /** + * 编码【烟台】 + */ + private String viaCode; + /** + * 编码全路径【烟台】 + */ + private String viaPathCode; /** * 同行人员【烟台】 */ @@ -220,6 +228,14 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { * 户籍地详细【烟台】 */ private String registeredResidenceAddress; + /** + * 编码【烟台】 + */ + private String registeredResidenceCode; + /** + * 编码全路径【烟台】 + */ + private String registeredResidencePathCode; /** * 是否带车 是/否 【烟台】 */ diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.92__alter_ic_trip_report.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.92__alter_ic_trip_report.sql new file mode 100644 index 0000000000..57751d7f40 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.92__alter_ic_trip_report.sql @@ -0,0 +1,63 @@ + +-- 去掉必填项 +ALTER TABLE `ic_trip_report_record` +MODIFY COLUMN `PRESENT_ADDRESS` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '现居地名称eg:山东省-青岛市-黄岛区-玫瑰山路社区' AFTER `PRESENT_ADDRESS_PATH_CODE`, +MODIFY COLUMN `DETAIL_ADDRESS` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '详细地址(烟台的对应address字段）' AFTER `PRESENT_ADDRESS`, +MODIFY COLUMN `SOURCE_ADDRESS` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '来源地区地址' AFTER `SOURCE_ADDRESS_PATH_CODE`, +MODIFY COLUMN `ARRIVE_DATE` date NULL COMMENT '到达日期' AFTER `SOURCE_ADDRESS`; + +ALTER TABLE `ic_trip_report_record` +MODIFY COLUMN `DETAIL_ADDRESS` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '详细地址(烟台的对应address字段）' AFTER `PRESENT_ADDRESS`; + + +-- 新增字段、索引 +ALTER TABLE `ic_trip_report_record` +ADD COLUMN `detection_abnormal` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '核酸检测报告异常 是/否【烟台】' AFTER `trip_data_type`, +ADD COLUMN `two_code_one_report_status` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '两码一报告状态 (正常 异常)【烟台】' AFTER `detection_abnormal`, +ADD COLUMN `declaration_status` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '申报状态( 0未审核 1审核通过 2无效数据)【烟台】' AFTER `two_code_one_report_status`, +ADD COLUMN `nonlocal_residence_history` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否有外地旅居史 是/否【烟台】' AFTER `declaration_status`, +ADD COLUMN `via_province` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '途经省【烟台】' AFTER `nonlocal_residence_history`, +ADD COLUMN `via_city` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '途经市【烟台】' AFTER `via_province`, +ADD COLUMN `via_county` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '途经县区【烟台】' AFTER `via_city`, +ADD COLUMN `via_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编码' AFTER `via_county`, +ADD COLUMN `via_path_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编码全路径' AFTER `via_code`, +ADD COLUMN `travel_personnel` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '同行人员【烟台】' AFTER `via_path_code`, +ADD COLUMN `registered_residence_city` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '户籍地【烟台】' AFTER `travel_personnel`, +ADD COLUMN `registered_residence_address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '户籍地详细【烟台】' AFTER `registered_residence_city`, +ADD COLUMN `registered_residence_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编码' AFTER `registered_residence_address`, +ADD COLUMN `registered_residence_path_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编码全路径' AFTER `registered_residence_code`, +ADD COLUMN `carry_vehicle` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否带车 是/否 【烟台】' AFTER `registered_residence_path_code`, +ADD COLUMN `carry_vehicle_number` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '带车车牌号【烟台】' AFTER `carry_vehicle`, +ADD COLUMN `carry_vehicle_number_color` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '车牌颜色【烟台】' AFTER `carry_vehicle_number`, +ADD COLUMN `destination_station` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '目的地交通场站【烟台】' AFTER `carry_vehicle_number_color`, +ADD COLUMN `arrive_lu_time` datetime NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '入鲁时间【烟台】' AFTER `destination_station`, +ADD COLUMN `travel_code_img` varchar(3000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '行程码【烟台】' AFTER `arrive_lu_time`, +ADD COLUMN `invalid_time` datetime NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '无效时间【烟台】' AFTER `travel_code_img`, +ADD COLUMN `card_type` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '证件类型【烟台】' AFTER `invalid_time`, +ADD COLUMN `area` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '区域【烟台】' AFTER `card_type`, +ADD COLUMN `age` int(22) NULL DEFAULT NULL COMMENT '年龄【烟台】' AFTER `area`, +ADD COLUMN `sex` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '性别【烟台】' AFTER `age`, +ADD COLUMN `covid_flag` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否有新冠肺炎病史 是/否 【烟台】' AFTER `sex`, +ADD COLUMN `come_mode` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '来烟方式【烟台】' AFTER `covid_flag`, +ADD COLUMN `shift` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '班次【烟台】' AFTER `come_mode`, +ADD COLUMN `arrive_time` datetime NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '抵烟时间【烟台】' AFTER `shift`, +ADD COLUMN `report_street` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上报街道【烟台】' AFTER `arrive_time`, +ADD COLUMN `come_area_full` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源地区全【烟台】' AFTER `report_street`, +ADD COLUMN `leave_the_risk_area_time` datetime NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '离开风险区域的时间【烟台】' AFTER `come_area_full`, +ADD COLUMN `carry_hesuan_proof` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否携带48小时核算证明 是/否【烟台】' AFTER `leave_the_risk_area_time`, +ADD COLUMN `province_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '省【烟台】' AFTER `carry_hesuan_proof`, +ADD COLUMN `city_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '市【烟台】' AFTER `province_name`, +ADD COLUMN `county_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '县【烟台】' AFTER `city_name`, +ADD COLUMN `twon_name` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '详细地址【烟台】' AFTER `county_name`, +ADD COLUMN `health_code_abnormal` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '健康码异常 是/否【烟台】' AFTER `twon_name`, +ADD COLUMN `travel_code_abnormal` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '行程码异常 是/否【烟台】' AFTER `health_code_abnormal`, +ADD COLUMN `i_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '【烟台】' AFTER `travel_code_abnormal`, +ADD COLUMN `i_date` varchar(7) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '【烟台】' AFTER `i_id`, +ADD COLUMN `i_type` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '【烟台】' AFTER `i_date`, +ADD COLUMN `i_time` datetime NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '【烟台】' AFTER `i_type`, +ADD COLUMN `i_flag` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '【烟台】' AFTER `i_time`, +ADD COLUMN `yt_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '烟台数据主键【烟台】对应烟台的id' AFTER `i_flag`, +DROP PRIMARY KEY, +ADD PRIMARY KEY (`ID`, `yt_id`), +ADD INDEX `yt_id` (`yt_id`) USING BTREE COMMENT '烟台数据Id普通索引'; +