Commit f4bc1b97 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.3' into MVP1.7.3

parents be903f2a c98e4f23
...@@ -34,7 +34,10 @@ import java.io.Serializable; ...@@ -34,7 +34,10 @@ import java.io.Serializable;
@Data @Data
public class TSocialHouseholdExportVo implements Serializable { public class TSocialHouseholdExportVo implements Serializable {
@ExcelAttribute(name = "账户性质" )
@Schema(description = "账户性质") @Schema(description = "账户性质")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("账户性质")
private String type; private String type;
/** /**
...@@ -176,7 +179,10 @@ public class TSocialHouseholdExportVo implements Serializable { ...@@ -176,7 +179,10 @@ public class TSocialHouseholdExportVo implements Serializable {
@ExcelProperty("医保-登录密码") @ExcelProperty("医保-登录密码")
private String mediclPassword; private String mediclPassword;
@ExcelAttribute(name = "是否配置公章" )
@Schema(description ="是否配置公章") @Schema(description ="是否配置公章")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否配置公章")
private String isSign; private String isSign;
/** /**
......
...@@ -109,11 +109,11 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable { ...@@ -109,11 +109,11 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
/** /**
* 手机号 * 手机号
*/ */
@ExcelAttribute(name = "手机号", maxLength = 50,isNotEmpty = true ) @ExcelAttribute(name = "手机号", maxLength = 50,isNotEmpty = true,isInteger = true )
@Schema(description ="手机号") @Schema(description ="手机号")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("手机号") @ExcelProperty("手机号")
private String phone; private Integer phone;
/** /**
* 类型 0 独立户 1 自由户 * 类型 0 独立户 1 自由户
......
...@@ -104,11 +104,11 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable { ...@@ -104,11 +104,11 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable {
/** /**
* 手机号 * 手机号
*/ */
@ExcelAttribute(name = "手机号", maxLength = 50) @ExcelAttribute(name = "手机号", maxLength = 50,isInteger = true)
@Schema(description ="手机号") @Schema(description ="手机号")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("手机号") @ExcelProperty("手机号")
private String phone; private Integer phone;
/** /**
* 类型 0 独立户 1 自由户 * 类型 0 独立户 1 自由户
......
package com.yifu.cloud.plus.v1.yifu.social.constants;
/**
* @author huych
* @description 户配置相关
* @date 2024/12/9
*/
public class HouseConfigConstants {
public static final String HOUSE_TYPE_ONE = "自有户";
public static final String HOUSE_TYPE_TWO = "独立户";
public static final String ERROR_SAME_HOUSE = "模板中已存在相同户名的数据";
public static final String ERROR_NOT_EXIT = "未找到对应账户性质、户名的配置";
public static final String ERROR_IS_EXIT = "对应账户性质、户名的配置已存在";
public static final String ERROR_TEMPLATE_ONE = "户类型只能是【自有户】或者【独立户】";
public static final String ERROR_TEMPLATE_TWO = "是否自动办理,选择是时,社保和医保信息必须填写其中一个";
public static final String ERROR_TEMPLATE_THREE = "是否自动办理只能为【是】或者【否】";
public static final String ERROR_TEMPLATE_FOUR = "未找到对应的审核人或办理人的人员信息";
public static final String ERROR_TEMPLATE_FIVE = "社保账户,社保密码和医保账户,医保密码的账号和密码必须都填写或者都不填写";
public static final String ERROR_TEMPLATE_SIX = "省市的信息需要填写完善!";
public static final String SUCESS = "成功";
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment