预估库

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TForecastLibrary.java

@@ -494,6 +494,12 @@ public class TForecastLibrary extends BaseEntity {
 	@ExcelAttribute(name = "数据同步：0未同步；1已同步")
 	@ExcelProperty("数据同步：0未同步；1已同步")
 	private Integer dataPush;
+	/**
+	 * 类型：0社保；1公积金
+	 */
+	@ExcelAttribute(name = "类型：0社保；1公积金")
+	@ExcelProperty("类型：0社保；1公积金")
+	private Integer dataType;
 
 	@TableField(exist = false)
 	private List<String> idList;

yifu-social/yifu-social-biz/src/main/resources/mapper/TForecastLibraryMapper.xml

@@ -94,6 +94,7 @@
 		<result property="providentHouseholdName" column="PROVIDENT_HOUSEHOLD_NAME"/>
 		<result property="providentNo" column="PROVIDENT_NO"/>
 		<result property="dataPush" column="DATA_PUSH"/>
+		<result property="dataType" column="DATA_TYPE"/>
 		<result property="createBy" column="CREATE_BY"/>
 		<result property="createName" column="CREATE_NAME"/>
 		<result property="createTime" column="CREATE_TIME"/>
@@ -101,84 +102,82 @@
 		<result property="updateTime" column="UPDATE_TIME"/>
 	</resultMap>
 	<sql id="Base_Column_List">
-		a
-		.
-		ID
-		,
-                a.EMP_ID,
-                a.EMP_NO,
-                a.EMP_NAME,
-                a.EMP_IDCARD,
-                a.SOCIAL_ID,
-                a.SETTLE_DOMAIN_ID,
-                a.UNIT_ID,
-                a.PROVIDENT_ID,
-                a.UNIT_PENSION_FEE,
-                a.UNIT_MEDICAL_FEE,
-                a.UNIT_UNEMPLOYMENT_FEE,
-                a.UNIT_WORK_INJURY_FEE,
-                a.UNIT_BIRTH_FEE,
-                a.UNIT_BITAILMENT_FEE,
-                a.PERSONAL_PENSION_FEE,
-                a.PERSONAL_MEDICAL_FEE,
-                a.PERSONAL_UNEMPLOYMENT_FEE,
-                a.PERSONAL_BIGAILMENT_FEE,
-                a.SOCIAL_PAY_MONTH,
-                a.SOCIAL_CREATE_MONTH,
-                a.PROVIDENT_PAY_MONTH,
-                a.PROVIDENT_CREATE_MONTH,
-                a.UNIT_SOCIAL_SUM,
-                a.UNIT_FUND_SUM,
-                a.PERSONAL_SOCIAL_SUM,
-                a.PERSONAL_FUND_SUM,
-                a.FUND_PROVINCE,
-                a.FUND_CITY,
-                a.FUND_TOWN,
-                a.SOCIAL_PROVINCE,
-                a.SOCIAL_CITY,
-                a.SOCIAL_TOWN,
-                a.UNIT_PENSION_BASE,
-                a.UNIT_MEDICAL_BASE,
-                a.UNIT_UNEMPLOYMENT_BASE,
-                a.UNIT_INJURY_BASE,
-                a.UNIT_BIRTH_BASE,
-                a.UNIT_BIGAILMENT_BASE,
-                a.PERSONAL_PENSION_BASE,
-                a.PERSONAL_MEDICAL_BASE,
-                a.PERSONAL_UNEMPLOYMENT_BASE,
-                a.PERSONAL_BIGAILMENT_BASE,
-                a.UNIT_PERSION_PRO,
-                a.UNIT_MEDICAL_PRO,
-                a.UNIT_UNEMPLOYMENT_PRO,
-                a.UNIT_INJURY_PRO,
-                a.UNIT_BIRTH_PRO,
-                a.UNIT_BIGAILMENT_PRO,
-                a.PERSONAL_PERSION_PRO,
-                a.PERSONAL_MEDICAL_PRO,
-                a.PERSONAL_UNEMPLOYMENT_PRO,
-                a.PERSONAL_BIGAILMENT_PRO,
-                a.UNIT_FUND_BASE,
-                a.PERSONAL_FUND_BASE,
-                a.UNIT_FUND_PROP,
-                a.PERSONAL_FUND_PROP,
-                a.REMARK,
-                a.PROJECT_ID,
-                a.UNIT_NAME,
-                a.DEPT_NAME,
-                a.EMP_NATRUE,
-                a.UNIT_INTEREST_FEE,
-                a.PERSONAL_INTEREST_FEE,
-                a.SOCIAL_HOUSEHOLD,
-                a.SOCIAL_HOUSEHOLD_NAME,
-                a.PROVIDENT_HOUSEHOLD,
-                a.PROVIDENT_HOUSEHOLD_NAME,
-                a.PROVIDENT_NO,
-                a.DATA_PUSH,
-                a.CREATE_BY,
-                a.CREATE_NAME,
-                a.CREATE_TIME,
-                a.UPDATE_BY,
-                a.UPDATE_TIME
+		a.ID,
+		a.EMP_ID,
+		a.EMP_NO,
+		a.EMP_NAME,
+		a.EMP_IDCARD,
+		a.SOCIAL_ID,
+		a.SETTLE_DOMAIN_ID,
+		a.UNIT_ID,
+		a.PROVIDENT_ID,
+		a.UNIT_PENSION_FEE,
+		a.UNIT_MEDICAL_FEE,
+		a.UNIT_UNEMPLOYMENT_FEE,
+		a.UNIT_WORK_INJURY_FEE,
+		a.UNIT_BIRTH_FEE,
+		a.UNIT_BITAILMENT_FEE,
+		a.PERSONAL_PENSION_FEE,
+		a.PERSONAL_MEDICAL_FEE,
+		a.PERSONAL_UNEMPLOYMENT_FEE,
+		a.PERSONAL_BIGAILMENT_FEE,
+		a.SOCIAL_PAY_MONTH,
+		a.SOCIAL_CREATE_MONTH,
+		a.PROVIDENT_PAY_MONTH,
+		a.PROVIDENT_CREATE_MONTH,
+		a.UNIT_SOCIAL_SUM,
+		a.UNIT_FUND_SUM,
+		a.PERSONAL_SOCIAL_SUM,
+		a.PERSONAL_FUND_SUM,
+		a.FUND_PROVINCE,
+		a.FUND_CITY,
+		a.FUND_TOWN,
+		a.SOCIAL_PROVINCE,
+		a.SOCIAL_CITY,
+		a.SOCIAL_TOWN,
+		a.UNIT_PENSION_BASE,
+		a.UNIT_MEDICAL_BASE,
+		a.UNIT_UNEMPLOYMENT_BASE,
+		a.UNIT_INJURY_BASE,
+		a.UNIT_BIRTH_BASE,
+		a.UNIT_BIGAILMENT_BASE,
+		a.PERSONAL_PENSION_BASE,
+		a.PERSONAL_MEDICAL_BASE,
+		a.PERSONAL_UNEMPLOYMENT_BASE,
+		a.PERSONAL_BIGAILMENT_BASE,
+		a.UNIT_PERSION_PRO,
+		a.UNIT_MEDICAL_PRO,
+		a.UNIT_UNEMPLOYMENT_PRO,
+		a.UNIT_INJURY_PRO,
+		a.UNIT_BIRTH_PRO,
+		a.UNIT_BIGAILMENT_PRO,
+		a.PERSONAL_PERSION_PRO,
+		a.PERSONAL_MEDICAL_PRO,
+		a.PERSONAL_UNEMPLOYMENT_PRO,
+		a.PERSONAL_BIGAILMENT_PRO,
+		a.UNIT_FUND_BASE,
+		a.PERSONAL_FUND_BASE,
+		a.UNIT_FUND_PROP,
+		a.PERSONAL_FUND_PROP,
+		a.REMARK,
+		a.PROJECT_ID,
+		a.UNIT_NAME,
+		a.DEPT_NAME,
+		a.EMP_NATRUE,
+		a.UNIT_INTEREST_FEE,
+		a.PERSONAL_INTEREST_FEE,
+		a.SOCIAL_HOUSEHOLD,
+		a.SOCIAL_HOUSEHOLD_NAME,
+		a.PROVIDENT_HOUSEHOLD,
+		a.PROVIDENT_HOUSEHOLD_NAME,
+		a.PROVIDENT_NO,
+		a.DATA_PUSH,
+		a.DATA_TYPE,
+		a.CREATE_BY,
+		a.CREATE_NAME,
+		a.CREATE_TIME,
+		a.UPDATE_BY,
+		a.UPDATE_TIME
 	</sql>
 	<sql id="tForecastLibrary_where">
 		<if test="tForecastLibrary != null">
@@ -398,6 +397,9 @@
 			<if test="tForecastLibrary.dataPush != null">
 				AND a.DATA_PUSH = #{tForecastLibrary.dataPush}
 			</if>
+			<if test="tForecastLibrary.dataType != null">
+				AND a.DATA_TYPE = #{tForecastLibrary.dataType}
+			</if>
 			<if test="tForecastLibrary.createBy != null and tForecastLibrary.createBy.trim() != ''">
 				AND a.CREATE_BY = #{tForecastLibrary.createBy}
 			</if>