Skip to content

Y
yifu-mvp
Commit 2a09e5c9 authored by hongguangwu's avatar hongguangwu
Browse files
Options

优化，别弄掉了

parent af2f9239
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 230 additions and 229 deletions
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java
View file @ 2a09e5c9
......@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
......@@ -77,103 +78,103 @@ public class TSocialFundInfo extends BaseEntity {
/**
* 员工身份证
*/
@Length(max = 20, message = "员工身份证 不能超过20个字符" )
@ExcelAttribute(name = "员工身份证", maxLength = 20)
@Schema(description = "员工身份证" )
@ExcelProperty("员工身份证" )
@Length(max = 20, message = "身份证号 不能超过20个字符" )
@ExcelAttribute(name = "身份证号", maxLength = 20)
@Schema(description = "身份证号" )
@ExcelProperty("身份证号" )
private String empIdcard;
/**
* 员工类型
*/
@Length(max = 32, message = "员工类型 不能超过32个字符" )
@ExcelAttribute(name = "员工类型", maxLength = 32)
@ExcelAttribute(name = "员工类型", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE)
@Schema(description = "员工类型" )
@ExcelProperty("员工类型" )
private String empType;
/**
* 结算主体
*/
@Length(max = 32, message = "结算主体 不能超过32个字符" )
@ExcelAttribute(name = "结算主体", maxLength = 32)
@Schema(description = "结算主体" )
@ExcelProperty("结算主体" )
@Length(max = 32, message = "项目id 不能超过32个字符" )
@ExcelAttribute(name = "项目id", maxLength = 32)
@Schema(description = "项目id" )
@ExcelProperty("项目id" )
private String settleDomain;
/**
* 结算主体
*/
@Length(max = 50, message = "结算主体 不能超过50个字符" )
@ExcelAttribute(name = "结算主体", maxLength = 50)
@Schema(description = "结算主体" )
@ExcelProperty("结算主体" )
@Length(max = 50, message = "社保项目名称不能超过50个字符" )
@ExcelAttribute(name = "社保项目名称", maxLength = 50)
@Schema(description = "社保项目名称" )
@ExcelProperty("社保项目名称" )
private String settleDomainName;
/**
* 结算主体编码
*/
@Length(max = 50, message = "结算主体编码不能超过50个字符" )
@ExcelAttribute(name = "结算主体编码", maxLength = 50)
@Schema(description = "结算主体编码" )
@ExcelProperty("结算主体编码" )
@Length(max = 50, message = "社保项目编码不能超过50个字符" )
@ExcelAttribute(name = "社保项目编码", maxLength = 50)
@Schema(description = "社保项目编码" )
@ExcelProperty("社保项目编码" )
private String settleDomainCode;
/**
* unitName
*/
@Length(max = 50, message = "unitName 不能超过50个字符" )
@ExcelAttribute(name = "unitName", maxLength = 50)
@Schema(description = "unitName" )
@ExcelProperty("unitName" )
@Length(max = 50, message = "社保单位名称不能超过50个字符" )
@ExcelAttribute(name = "社保单位名称", maxLength = 50)
@Schema(description = "社保单位名称" )
@ExcelProperty("社保单位名称" )
private String unitName;
/**
* unitId
*/
@ExcelAttribute(name = "unitId", maxLength = 32)
@Schema(description = "unitId" )
@ExcelProperty("unitId" )
@ExcelAttribute(name = "社保单位id", maxLength = 32)
@Schema(description = "社保单位id" )
@ExcelProperty("社保单位id" )
private String unitId;
/**
* 结算主体-公积金
*/
@ExcelAttribute(name = "结算主体-公积金", maxLength = 32)
@Schema(description = "结算主体-公积金" )
@ExcelProperty("结算主体-公积金" )
@ExcelAttribute(name = "公积金项目id", maxLength = 32)
@Schema(description = "公积金项目id" )
@ExcelProperty("公积金项目id" )
private String settleDomainFund;
/**
* 结算主体-公积金
*/
@ExcelAttribute(name = "结算主体-公积金", maxLength = 50)
@Schema(description = "结算主体-公积金" )
@ExcelProperty("结算主体-公积金" )
@ExcelAttribute(name = "公积金项目名称", maxLength = 50)
@Schema(description = "公积金项目名称" )
@ExcelProperty("公积金项目名称" )
private String settleDomainNameFund;
/**
* 结算主体编码-公积金
*/
@ExcelAttribute(name = "结算主体编码-公积金", maxLength = 50)
@Schema(description = "结算主体编码-公积金" )
@ExcelProperty("结算主体编码-公积金" )
@ExcelAttribute(name = "公积金项目编码", maxLength = 50)
@Schema(description = "公积金项目编码" )
@ExcelProperty("公积金项目编码" )
private String settleDomainCodeFund;
/**
* 单位名称-公积金
*/
@ExcelAttribute(name = "单位名称-公积金", maxLength = 50)
@Schema(description = "单位名称-公积金" )
@ExcelProperty("单位名称-公积金" )
@ExcelAttribute(name = "公积金单位名称", maxLength = 50)
@Schema(description = "公积金单位名称" )
@ExcelProperty("公积金单位名称" )
private String unitNameFund;
/**
* 单位ID
*/
@ExcelAttribute(name = "单位ID", maxLength = 32)
@Schema(description = "单位ID" )
@ExcelProperty("单位ID" )
@ExcelAttribute(name = "公积金单位id", maxLength = 32)
@Schema(description = "公积金单位id" )
@ExcelProperty("公积金单位id" )
private String unitIdFund;
/**
* 社保户
*/
@Length(max = 32, message = "社保户 不能超过32个字符" )
@ExcelAttribute(name = "社保户", maxLength = 32)
@Schema(description = "社保户" )
@ExcelProperty("社保户" )
@Length(max = 32, message = "社保户id 不能超过32个字符" )
@ExcelAttribute(name = "社保户id", maxLength = 32)
@Schema(description = "社保户id" )
@ExcelProperty("社保户id" )
private String socialHousehold;
/**
* 社保户
......
yifu-social/yifu-social-biz/src/main/resources/mapper/SysBaseSetInfoMapper.xml
View file @ 2a09e5c9
......@@ -85,10 +85,6 @@
select="com.yifu.cloud.plus.v1.yifu.social.mapper.SysPayProportionMapper.selectByPrimaryId" column="id">
</collection>
</resultMap>
<sql id="base_column_list">
SELECT
a.*
</sql>
<sql id="Base_Column_List">
a.ID,
a.PROVINCE,
......@@ -328,7 +324,8 @@
</sql>
<!--sysBaseSetInfo简单分页查询-->
<select id="getSysBaseSetInfoPage" resultMap="sysBaseSetInfoMap">
<include refid="Base_Column_List"/>
SELECT
<include refid="Base_Column_List"/>
FROM sys_base_set_info a
<where>
1=1
......@@ -338,7 +335,8 @@
</select>
<!--sysBaseSetInfo简单查询-->
<select id="getAllByEntity" resultMap="sysBaseSetInfoMap">
<include refid="base_column_list"/>
SELECT
<include refid="Base_column_list"/>
FROM sys_base_set_info a
<where>
1=1
......@@ -348,7 +346,8 @@
<!--获取对应户名称的公积金基数信息-->
<select id="getFundBaseSet" resultMap="sysBaseSetInfoMap">
<include refid="base_column_list"/>
SELECT
<include refid="Base_column_list"/>
FROM sys_base_set_info a
<where>
1=1
......@@ -369,7 +368,8 @@
<!--sysBaseSetInfo不分页查询-->
<select id="getSysBaseSetInfoNoPage" resultMap="sysBaseSetInfoMap">
<include refid="base_column_list"/>
SELECT
<include refid="Base_column_list"/>
FROM sys_base_set_info a
<where>
1=1
......
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