Commit 60b26040 authored by fangxinjiang's avatar fangxinjiang

自定义字体-fxj

parent 0d949d65
...@@ -74,6 +74,15 @@ public class TAutoSocialRuleRel extends BaseEntity { ...@@ -74,6 +74,15 @@ public class TAutoSocialRuleRel extends BaseEntity {
@ExcelProperty("社保户ID") @ExcelProperty("社保户ID")
@Schema(description = "社保户ID") @Schema(description = "社保户ID")
private String configHouseId; private String configHouseId;
/**
* 社保户名称
*/
@ExcelAttribute(name = "社保户名称", maxLength = 50, isNotEmpty = true, errorInfo = "社保户名称不能为空")
@Length(max = 50, message = "社保户名称不能超过50个字符")
@ExcelProperty("社保户名称")
@Schema(description = "社保户名称")
private String configHouseName;
/** /**
* 社保起缴日期是否一致(0-是,1-否) * 社保起缴日期是否一致(0-是,1-否)
*/ */
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
<result property="mainId" column="MAIN_ID"/> <result property="mainId" column="MAIN_ID"/>
<result property="configName" column="CONFIG_NAME"/> <result property="configName" column="CONFIG_NAME"/>
<result property="configHouseId" column="CONFIG_HOUSE_ID"/> <result property="configHouseId" column="CONFIG_HOUSE_ID"/>
<result property="configHouseName" column="CONFIG_HOUSE_NAME"/>
<result property="socialDateFlag" column="SOCIAL_DATE_FLAG"/> <result property="socialDateFlag" column="SOCIAL_DATE_FLAG"/>
<result property="socialDateType" column="SOCIAL_DATE_TYPE"/> <result property="socialDateType" column="SOCIAL_DATE_TYPE"/>
<result property="paymentType" column="PAYMENT_TYPE"/> <result property="paymentType" column="PAYMENT_TYPE"/>
...@@ -60,7 +61,8 @@ ...@@ -60,7 +61,8 @@
a.CREATE_TIME, a.CREATE_TIME,
a.UPDATE_BY, a.UPDATE_BY,
a.UPDATE_NAME, a.UPDATE_NAME,
a.UPDATE_TIME a.UPDATE_TIME,
a.CONFIG_HOUSE_NAME
</sql> </sql>
<sql id="tAutoSocialRuleRel_where"> <sql id="tAutoSocialRuleRel_where">
<if test="tAutoSocialRuleRel != null"> <if test="tAutoSocialRuleRel != null">
......
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