工资-按照项目的配置来取社保公积金

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TSettleDomain.java

@@ -16,10 +16,12 @@
  */
 package com.yifu.cloud.plus.v1.yifu.archives.entity;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -328,5 +330,19 @@ public class TSettleDomain extends BaseEntity {
 	@Schema(description = "回款周期1-12")
 	private String backPayCycle;
 
+	/**
+	 * 社保类型0：缴费库；1：预估库
+	 */
+	@ExcelAttribute(name = "社保类型0：缴费库；1：预估库")
+	@ExcelProperty("社保类型0：缴费库；1：预估库")
+	@Schema(description = "社保类型0：缴费库；1：预估库")
+	private String socialType;
+	/**
+	 * 公积金类型0：缴费库；1：预估库
+	 */
+	@ExcelAttribute(name = "公积金类型0：缴费库；1：预估库")
+	@ExcelProperty("公积金类型0：缴费库；1：预估库")
+	@Schema(description = "公积金类型0：缴费库；1：预估库")
+	private String fundType;
 
 }

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml

@@ -71,64 +71,65 @@
 		<result property="exceptionRemark" column="EXCEPTION_REMARK"/>
 		<result property="existAdvancePayment" column="EXIST_ADVANCE_PAYMENT"/>
 		<result property="backPayCycle" column="BACK_PAY_CYCLE"/>
+		<result property="socialType" column="SOCIAL_TYPE"/>
+		<result property="fundType" column="FUND_TYPE"/>
 	</resultMap>
 
 	<sql id="Base_Column_List">
-		a
-		.
-		ID
-		,
-                a.DEPART_NO,
-                a.DEPART_NAME,
-                a.IS_NEW,
-                a.NEW_REMARK,
-                a.DELETE_FLAG,
-                a.DP_AUDIT_FLAG,
-                a.OLD_ID,
-                a.BELONG_CONTRACT,
-                a.DP_AUDIT_OPINION,
-                a.DP_AUDIT_MAN,
-                a.DP_AUDIT_MAN_NAME,
-                a.LAST_AUDIT_DATE,
-                a.SERVER_ITEM,
-                a.INCOME_BELONG,
-                a.INCOME_BELONG_SUB,
-                a.CUSTOMER_ID,
-                a.CREATE_USER_NAME,
-                a.COMMIT_USER,
-                a.COMMIT_USER_NAME,
-                a.BALANCE,
-                a.INVOICE_BALANCE,
-                a.FIRST_PASS_FLAG,
-                a.FIRST_PASS_TIME,
-                a.PROVINCE,
-                a.CITY,
-                a.TOWN,
-                a.STOP_FLAG,
-                a.employee_num,
-                a.STOP_DATE,
-                a.STOP_REASON,
-                a.STOP_USER,
-                a.STOP_USER_NAME,
-                a.TYPE,
-                a.BUSINESS_PRIMARY_TYPE,
-                a.BUSINESS_SECOND_TYPE,
-                a.BUSINESS_THIRD_TYPE,
-                a.MANAGER_AUDIT_OPINION,
-                a.MANAGER_AUDIT_MAN,
-                a.MANAGER_AUDIT_MAN_NAME,
-                a.AUDIT_TIME,
-                a.MANAGER_AUDIT_TIME,
-                a.CREATE_TYPE,
-                a.RELATE_FLAG,
-                a.EXCEPTION_REMARK,
-                a.EXIST_ADVANCE_PAYMENT,
-                a.BACK_PAY_CYCLE,
-                a.CREATE_BY,
-                a.CREATE_NAME,
-                a.CREATE_TIME,
-                a.UPDATE_BY,
-                a.UPDATE_TIME
+		a.ID,
+		a.DEPART_NO,
+		a.DEPART_NAME,
+		a.IS_NEW,
+		a.NEW_REMARK,
+		a.DELETE_FLAG,
+		a.DP_AUDIT_FLAG,
+		a.OLD_ID,
+		a.BELONG_CONTRACT,
+		a.DP_AUDIT_OPINION,
+		a.DP_AUDIT_MAN,
+		a.DP_AUDIT_MAN_NAME,
+		a.LAST_AUDIT_DATE,
+		a.SERVER_ITEM,
+		a.INCOME_BELONG,
+		a.INCOME_BELONG_SUB,
+		a.CUSTOMER_ID,
+		a.CREATE_USER_NAME,
+		a.COMMIT_USER,
+		a.COMMIT_USER_NAME,
+		a.BALANCE,
+		a.INVOICE_BALANCE,
+		a.FIRST_PASS_FLAG,
+		a.FIRST_PASS_TIME,
+		a.PROVINCE,
+		a.CITY,
+		a.TOWN,
+		a.STOP_FLAG,
+		a.employee_num,
+		a.STOP_DATE,
+		a.STOP_REASON,
+		a.STOP_USER,
+		a.STOP_USER_NAME,
+		a.TYPE,
+		a.BUSINESS_PRIMARY_TYPE,
+		a.BUSINESS_SECOND_TYPE,
+		a.BUSINESS_THIRD_TYPE,
+		a.MANAGER_AUDIT_OPINION,
+		a.MANAGER_AUDIT_MAN,
+		a.MANAGER_AUDIT_MAN_NAME,
+		a.AUDIT_TIME,
+		a.MANAGER_AUDIT_TIME,
+		a.CREATE_TYPE,
+		a.RELATE_FLAG,
+		a.EXCEPTION_REMARK,
+		a.EXIST_ADVANCE_PAYMENT,
+		a.BACK_PAY_CYCLE,
+		a.CREATE_BY,
+		a.CREATE_NAME,
+		a.CREATE_TIME,
+		a.UPDATE_BY,
+		a.UPDATE_TIME,
+		a.SOCIAL_TYPE,
+		a.FUND_TYPE
 	</sql>
 
 	<resultMap id="tSettleDomainSelectVoMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo">