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 f40344f6cb..79824e838a 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 @@ -279,11 +279,6 @@ public class IcTripReportRecordDTO implements Serializable { */ @ExcelIgnore private String registeredResidence; - /** - * 年龄【磐石】 - */ - @ExcelIgnore - private int age; /** * 来曹事由【磐石】 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index b088332acf..1f2cf09949 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -209,10 +209,6 @@ public class IcTripReportFormDTO implements Serializable { */ @NotBlank(message = "户籍地不能为空", groups = {PsAdd.class}) private String registeredResidence; - /** - * 年龄【磐石】 - */ - private int age; /** * 来曹事由【磐石】 */ 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 c261c5acd9..497e0707c6 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 @@ -139,10 +139,6 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { * 户籍地 【磐石】 */ private String registeredResidence; - /** - * 年龄【磐石】 - */ - private int age; /** * 来曹事由【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java index 04a8a16900..4410c61293 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -19,10 +19,6 @@ public class IcPsTripReportRecordExcel { @NotBlank(message = "姓名不能为空") private String name; - @ExcelProperty("年龄") - //@NotNull(message = "年龄不能为空") - private Integer age; - @ExcelProperty("证件号") @NotBlank(message = "证件号不能为空") private String idCard; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java index 150dfd684d..73af0b78d0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java @@ -6,10 +6,8 @@ import com.alibaba.excel.annotation.write.style.HeadStyle; import com.alibaba.excel.enums.poi.FillPatternTypeEnum; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.util.Date; /** @@ -25,31 +23,25 @@ public class IcPsTripReportRecordExportExcel implements Serializable { * 姓名 */ @ColumnWidth(12) - @ExcelProperty(value = "姓名", order = 1) + @ExcelProperty(value = "姓名") private String name; - /** - * 年龄【磐石】 - */ - @ColumnWidth(10) - @ExcelProperty(value = "年龄",order = 2) - private int age; /** * 证件号 */ @ColumnWidth(20) - @ExcelProperty(value = "证件号",order = 3) + @ExcelProperty(value = "证件号") private String idCard; /** * 户籍地 【磐石】 */ @ColumnWidth(28) - @ExcelProperty(value = "户籍地(省市县区)",order = 4) + @ExcelProperty(value = "户籍地(省市县区)") private String registeredResidence; /** * 手机号 */ @ColumnWidth(15) - @ExcelProperty(value = "手机号",order = 5) + @ExcelProperty(value = "手机号") private String mobile; /** * 来自地区(格式:省-市-区-街道-社区) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql index 8d7d62ce97..847f53f326 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.81__alter_ic_trip_report.sql @@ -17,3 +17,6 @@ ADD COLUMN `control_measures` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb ADD COLUMN `trip_data_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '行程记录类型,字典表(trip_data_type)【磐石】' AFTER `control_measures`; +ALTER TABLE `ic_trip_report_record` +DROP COLUMN `age`; + diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx index 5566dc466d..186dee0bf7 100644 Binary files a/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx and b/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx differ