diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/lingshan/LingshanHelpCrowdSaveFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/lingshan/LingshanHelpCrowdSaveFormDTO.java index d3e826eb2f..23b01177a7 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/lingshan/LingshanHelpCrowdSaveFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/lingshan/LingshanHelpCrowdSaveFormDTO.java @@ -139,8 +139,8 @@ public class LingshanHelpCrowdSaveFormDTO { /** * 最初享受月份 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM") + @DateTimeFormat(pattern = "yyyy-MM") private Date zcxsyf; /** @@ -381,8 +381,8 @@ public class LingshanHelpCrowdSaveFormDTO { /** * 最初享受月份 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM") + @DateTimeFormat(pattern = "yyyy-MM") private Date zcxsyf; /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/lingshan/LingshanHelpCrowdDetailRstDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/lingshan/LingshanHelpCrowdDetailRstDTO.java index 1ccd52e753..2f0e1ee621 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/lingshan/LingshanHelpCrowdDetailRstDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/lingshan/LingshanHelpCrowdDetailRstDTO.java @@ -143,7 +143,7 @@ public class LingshanHelpCrowdDetailRstDTO { /** * 最初享受月份 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM") private Date zcxsyf; /** @@ -384,7 +384,7 @@ public class LingshanHelpCrowdDetailRstDTO { /** * 最初享受月份 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM") private Date zcxsyf; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdCanjiExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdCanjiExcelData.java index f2b6569385..c59ef12347 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdCanjiExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdCanjiExcelData.java @@ -9,6 +9,7 @@ import com.epmet.excel.converter.LingShanSpecialCrowdYesOrNoConverter; import lombok.Data; import lombok.EqualsAndHashCode; +import javax.validation.constraints.NotBlank; import java.util.Date; /** @@ -24,18 +25,21 @@ public class LingshanHelpCrowdCanjiExcelData extends LingShanHelpCrowdBaseExcelD * 残疾证号 */ @ExcelProperty(value = "*残疾证号") + @NotBlank(message = "残疾证号必填") private String cjzh; /** * 残疾类别，字典 */ @ExcelProperty(value = "*残疾类型", converter = LingShanHelpCrowdExcelConverter.class) + @NotBlank(message = "残疾类型必填") private String cjlb; /** * 残疾登记（状况） 字典 */ @ExcelProperty(value = "*残疾等级", converter = LingShanHelpCrowdExcelConverter.class) + @NotBlank(message = "残疾等级必填") private String cjzk; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDabingExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDabingExcelData.java index 93e0dd353b..3a8fba9b4e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDabingExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDabingExcelData.java @@ -6,6 +6,8 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -21,12 +23,14 @@ public class LingshanHelpCrowdDabingExcelData extends LingShanHelpCrowdBaseExcel * 所患病种（大病） */ @ExcelProperty(value = "*患病病种") + @NotBlank(message = "患病病种必填") private String shbz; /** * 患病时间 */ @ExcelProperty(value = "*患病时间") + @NotNull(message = "患病时间必填") private Date hbsj; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDibaoExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDibaoExcelData.java index beb96e2e27..58137b7ae9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDibaoExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDibaoExcelData.java @@ -1,6 +1,7 @@ package com.epmet.excel.data; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.format.DateTimeFormat; import com.baomidou.mybatisplus.annotation.TableName; import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import com.epmet.excel.converter.LingShanHelpCrowdExcelConverter; @@ -8,6 +9,8 @@ import com.epmet.excel.converter.LingShanSpecialCrowdYesOrNoConverter; import lombok.Data; import lombok.EqualsAndHashCode; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; @@ -30,12 +33,14 @@ public class LingshanHelpCrowdDibaoExcelData extends LingShanHelpCrowdBaseExcelD * 低保类型。200农村低保，201城镇低保 */ @ExcelProperty(value = "*低保类型", converter = LingShanHelpCrowdExcelConverter.class) + @NotNull(message = "低保类型必填") private Integer dblx; /** * 低保（特困）证号 */ @ExcelProperty(value = "*低保（特困）证号") + @NotBlank(message = "低保（特困）证号必填") private String dbzh; /** @@ -90,6 +95,7 @@ public class LingshanHelpCrowdDibaoExcelData extends LingShanHelpCrowdBaseExcelD * 最初享受月份 */ @ExcelProperty(value = "最初享受月份") + @DateTimeFormat("yyyy-MM") private Date zcxsyf; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDujuExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDujuExcelData.java index d4587a9b98..59a7ff7406 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDujuExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdDujuExcelData.java @@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.epmet.excel.converter.LingShanHelpCrowdExcelConverter; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * 重点帮扶-独居老人 * @@ -17,12 +19,14 @@ public class LingshanHelpCrowdDujuExcelData extends LingShanHelpCrowdBaseExcelDa * 监护人姓名 */ @ExcelProperty(value = "*监护人姓名") + @NotBlank(message = "监护人姓名必填") private String jhrxm; /** * 监护人电话 */ @ExcelProperty(value = "*监护人电话") + @NotBlank(message = "监护人电话必填") private String jhrdh; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdGaolingExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdGaolingExcelData.java index 95f261caf0..9b1edc5645 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdGaolingExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdGaolingExcelData.java @@ -7,6 +7,8 @@ import com.epmet.excel.converter.LingShanHelpCrowdExcelConverter; import lombok.Data; import lombok.EqualsAndHashCode; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; /** @@ -28,6 +30,7 @@ public class LingshanHelpCrowdGaolingExcelData extends LingShanHelpCrowdBaseExce * 津贴金额（元） */ @ExcelProperty(value = "*津贴金额（元）") + @NotNull(message = "津贴金额（元）必填") private BigDecimal jtje; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdKongchaoExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdKongchaoExcelData.java index 70fa06a071..3379d5ab2a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdKongchaoExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdKongchaoExcelData.java @@ -7,6 +7,8 @@ import com.epmet.excel.converter.LingShanHelpCrowdExcelConverter; import lombok.Data; import lombok.EqualsAndHashCode; +import javax.validation.constraints.NotBlank; + /** * 重点帮扶-独居老人 * @@ -20,12 +22,14 @@ public class LingshanHelpCrowdKongchaoExcelData extends LingShanHelpCrowdBaseExc * 监护人姓名 */ @ExcelProperty(value = "*监护人姓名") + @NotBlank(message = "监护人姓名必填") private String jhrxm; /** * 监护人电话 */ @ExcelProperty(value = "*监护人电话") + @NotBlank(message = "监护人电话必填") private String jhrdh; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdLiushouExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdLiushouExcelData.java index 88a2c7e33b..d3935e4e57 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdLiushouExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdLiushouExcelData.java @@ -6,6 +6,8 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import javax.validation.constraints.NotBlank; + /** * 重点帮扶-留守儿童 * @@ -19,24 +21,28 @@ public class LingshanHelpCrowdLiushouExcelData extends LingShanHelpCrowdBaseExce * 监护人姓名 */ @ExcelProperty(value = "*监护人姓名") + @NotBlank(message = "监护人姓名必填") private String jhrxm; /** * 监护人电话 */ @ExcelProperty(value = "*监护人电话") + @NotBlank(message = "监护人电话必填") private String jhrdh; /** * 与监护人关系 */ @ExcelProperty(value = "*与监护人关系") + @NotBlank(message = "与监护人关系必填") private String yjhrgx; /** * 所在学校及班级 */ @ExcelProperty(value = "*所在学校及班级") + @NotBlank(message = "所在学校及班级必填") private String szxxjbj; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdTekunExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdTekunExcelData.java index 44c96f1c06..f2aec63f15 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdTekunExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanHelpCrowdTekunExcelData.java @@ -1,6 +1,7 @@ package com.epmet.excel.data; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.format.DateTimeFormat; import com.baomidou.mybatisplus.annotation.TableName; import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import com.epmet.excel.converter.LingShanHelpCrowdExcelConverter; @@ -8,6 +9,7 @@ import com.epmet.excel.converter.LingShanSpecialCrowdYesOrNoConverter; import lombok.Data; import lombok.EqualsAndHashCode; +import javax.validation.constraints.NotBlank; import java.math.BigDecimal; import java.util.Date; @@ -30,6 +32,7 @@ public class LingshanHelpCrowdTekunExcelData extends LingShanHelpCrowdBaseExcelD * 低保（特困）证号 */ @ExcelProperty(value = "*低保（特困）证号") + @NotBlank(message = "低保（特困）证号必填") private String dbzh; /** @@ -84,6 +87,7 @@ public class LingshanHelpCrowdTekunExcelData extends LingShanHelpCrowdBaseExcelD * 最初享受月份 */ @ExcelProperty(value = "最初享受月份") + @DateTimeFormat("yyyy-MM") private Date zcxsyf; /**