陈航-留守老人-字段与表必填项调整

ruoyi-modules/mz-business-lrgl/src/main/java/com/ruoyi/business/domain/ZwywLrJbxx.java

@@ -66,22 +66,22 @@ public class ZwywLrJbxx extends BaseEntity
     /** 出生日期 */
 //    @Excel(name = "出生日期")
     @ApiModelProperty(value = "出生日期", required = true)
-    @NotBlank(message = "{出生日期}",groups = AddGroup.class)
+//    @NotBlank(message = "{出生日期}",groups = AddGroup.class)
     @DateV(pattern = "yyyyMMdd", message = "{出生日期}")
     private String lrCsrq;
 
     /** 学历 */
     @Excel(name = "学历")
     @ApiModelProperty(value = "学历", required = true)
-    @NotBlank(message = "{学历}",groups = AddGroup.class)
+//    @NotBlank(message = "{学历}",groups = AddGroup.class)
     @DictV(type = "C0008",message = "{学历}")
     private String lrXl;
 
     /** 政治面貌 */
     @Excel(name = "政治面貌")
     @ApiModelProperty(value = "政治面貌", required = true)
-    @NotBlank(message = "{政治面貌}",groups = AddGroup.class)
-    @DictV(type = "C0013",message = "{政治面貌}")
+//    @NotBlank(message = "{政治面貌}",groups = AddGroup.class)
+//    @DictV(type = "C0013",message = "{政治面貌}")
     private String lrZzmm;
 
     /** 民族 */
@@ -94,7 +94,7 @@ public class ZwywLrJbxx extends BaseEntity
     /** 国籍 */
     @Excel(name = "国籍")
     @ApiModelProperty(value = "国籍", required = true)
-    @NotBlank(message = "{国籍}",groups = AddGroup.class)
+//    @NotBlank(message = "{国籍}",groups = AddGroup.class)
     @DictV(type = "XZ002",message = "{国籍}")
     @Size(max = 3, message = "{国籍}")
     private String lrGj;
@@ -102,7 +102,7 @@ public class ZwywLrJbxx extends BaseEntity
     /** 籍贯 */
     @Excel(name = "籍贯")
     @ApiModelProperty(value = "籍贯", required = true)
-    @NotBlank(message = "{籍贯}",groups = AddGroup.class)
+//    @NotBlank(message = "{籍贯}",groups = AddGroup.class)
     @Size(max = 100, message = "{籍贯}")
     private String lrJg;
 
@@ -128,7 +128,7 @@ public class ZwywLrJbxx extends BaseEntity
     /** 户籍类别 */
     @Excel(name = "户籍类别")
     @ApiModelProperty(value = "户籍类别", required = true)
-    @NotBlank(message = "{户籍类别}",groups = AddGroup.class)
+//    @NotBlank(message = "{户籍类别}",groups = AddGroup.class)
     @DictV(type = "C0031",message = "{户籍类别}")
     private String lrHjlb;
 
@@ -161,11 +161,13 @@ public class ZwywLrJbxx extends BaseEntity
     /** 常用联系电话 */
 //    @Excel(name = "常用联系电话")
     @ApiModelProperty(value = "常用联系电话")
+    @NotBlank(message = "{常用联系电话}",groups = AddGroup.class)
     @EncryptionV
     private String lrCydh;
 
     /** 婚姻状况 */
 //    @Excel(name = "婚姻状况")
+    @NotBlank(message = "{婚姻状况}",groups = AddGroup.class)
     @ApiModelProperty(value = "婚姻状况")
     @DictV(type = "XZ025",message = "{婚姻状况}")
     private String lrHyzk;
@@ -239,6 +241,7 @@ public class ZwywLrJbxx extends BaseEntity
     /** 生活状况 */
 //    @Excel(name = "生活状况")
     @ApiModelProperty(value = "生活状况")
+    @NotBlank(message = "{生活状况}")
     @DictV(type = "CZ027", isMuti = true, message = "{生活状况}")
     private String lrJjzk;
 
@@ -309,7 +312,7 @@ public class ZwywLrJbxx extends BaseEntity
     /** 健康状况 */
 //    @Excel(name = "健康状况")
     @ApiModelProperty(value = "健康状况", required = true)
-//    @NotBlank(message = "{健康状况}")
+    @NotBlank(message = "{健康状况}")
     @DictV(type = "XZ015", isMuti = true, message = "{健康状况}")
     private String lrJkzk;
 
@@ -327,12 +330,14 @@ public class ZwywLrJbxx extends BaseEntity
 
     /** 能力状况 */
 //    @Excel(name = "能力状况")
+    @NotBlank(message = "{能力状况}")
     @ApiModelProperty(value = "能力状况")
     @DictV(type = "CH050",message = "{能力状况}")
     private String lrNlzk;
 
     /** 收入来源 */
 //    @Excel(name = "收入来源")
+    @NotBlank(message = "{收入来源}")
     @ApiModelProperty(value = "收入来源")
     @DictV(type = "CH054", isMuti = true, message = "{收入来源}")
     private String lrSrly;
@@ -346,6 +351,7 @@ public class ZwywLrJbxx extends BaseEntity
     /** 上年度可支配收入 */
 //    @Excel(name = "上年度可支配收入")
     @ApiModelProperty(value = "上年度可支配收入")
+    @NotBlank(message = "{上年度可支配收入}")
     @DictV(type = "XZ014", message = "{上年度可支配收入}")
     private String lrKzpsr;
 
@@ -358,6 +364,7 @@ public class ZwywLrJbxx extends BaseEntity
     /** 家庭救助帮扶 */
 //    @Excel(name = "家庭救助帮扶")
     @ApiModelProperty(value = "家庭救助帮扶")
+    @NotBlank(message = "{家庭救助帮扶}")
     @DictV(type = "CH058", isMuti = true, message = "{家庭救助帮扶}")
     private String lrJtjzbfqk;
 
@@ -370,6 +377,7 @@ public class ZwywLrJbxx extends BaseEntity
     /** 陪伴居住情况 */
 //    @Excel(name = "陪伴居住情况")
     @ApiModelProperty(value = "陪伴居住情况")
+    @NotBlank(message = "{陪伴居住情况}")
     @DictV(type = "CH057",isMuti = true, message = "{陪伴居住情况}")
     private String lrPbjjqk;
 
@@ -382,6 +390,7 @@ public class ZwywLrJbxx extends BaseEntity
     /** 日常生活照料人 */
 //    @Excel(name = "日常生活照料人")
     @ApiModelProperty(value = "日常生活照料人")
+    @NotBlank(message = "{日常生活照料人}")
     @DictV(type = "CH056", isMuti = true, message = "{日常生活照料人}")
     private String zlrLb;
 
@@ -414,6 +423,7 @@ public class ZwywLrJbxx extends BaseEntity
     /** 关爱服务需求 */
 //    @Excel(name = "关爱服务需求")
     @ApiModelProperty(value = "关爱服务需求")
+    @NotBlank(message = "{关爱服务需求}")
     @DictV(type = "CH055", isMuti = true, message = "{关爱服务需求}")
     private String lrGaxq;