磐石删除年龄字段引起的调整

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;
     /**
      * 来曹事由【磐石】
      */

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;
     /**
      * 来曹事由【磐石】
      */

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;
     /**
      * 来曹事由【磐石】
      */

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;

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;
     /**
      * 来自地区（格式：省-市-区-街道-社区）

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`;
+