实缴导入校验项目

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

@@ -663,6 +663,13 @@ public class TPaymentInfo extends BaseEntity {
 	@ExcelProperty("支出信息付款状态")
 	private String payCollectFlag;
 
+	/**
+	 * EKP的 是否BPO：  是  否
+	 */
+	@Schema(description = "是否BPO", name = "bpoFlag")
+	@ExcelIgnore
+	private String bpoFlag;
+
 	/**
 	 * 是否需要生成收入
 	 */

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

@@ -211,6 +211,15 @@ public class TProvidentFund extends BaseEntity {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("项目" )
 	private String settleDomain;
+	/**
+	 * 项目编码
+	 */
+	@Length(max = 32, message = "项目编码 不能超过32个字符" )
+	@ExcelAttribute(name = "项目编码", maxLength = 32)
+	@Schema(description = "项目编码" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("项目编码" )
+	private String settleDomainCode;
 	/**
 	 * 缴纳地-省
 	 */

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

@@ -314,6 +314,15 @@ public class TSocialInfo extends BaseEntity {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("项目" )
 	private String settleDomain;
+	/**
+	 * 项目编码
+	 */
+	@Length(max = 32, message = "项目编码 不能超过32个字符" )
+	@ExcelAttribute(name = "项目编码", maxLength = 32)
+	@Schema(description = "项目编码" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("项目编码" )
+	private String settleDomainCode;
 	/**
 	 * 缴纳地-省
 	 */

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -1373,6 +1373,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			fund.setDeleteFlag(CommonConstants.ZERO_STRING);
 			fund.setBelongUnit(excel.getCustomerId());
 			fund.setSettleDomain(excel.getSettleDomainId());
+			fund.setSettleDomainCode(excel.getSettleDomainCode());
 			if (Common.isNotNull(empVo)){
 				fund.setEmpId(empVo.getId());
 				fund.setEmpNo(empVo.getEmpNo());
@@ -1504,6 +1505,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			//  封装单位信息 结算信息
 			social.setBelongUnit(excel.getCustomerId());
 			social.setSettleDomain(excel.getSettleDomainId());
+			social.setSettleDomainCode(excel.getSettleDomainCode());
 			if (Common.isNotNull(empVo)){
 				social.setEmpId(empVo.getId());
 				social.setEmpName(empVo.getEmpName());

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

@@ -43,6 +43,7 @@
     <result property="empName" column="EMP_NAME"/>
     <result property="empIdcard" column="EMP_IDCARD"/>
     <result property="settleDomain" column="SETTLE_DOMAIN"/>
+    <result property="settleDomainCode" column="SETTLE_DOMAIN_CODE"/>
     <result property="fundProvince" column="FUND_PROVINCE"/>
     <result property="fundCity" column="FUND_CITY"/>
     <result property="fundTown" column="FUND_TOWN"/>

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

@@ -56,6 +56,7 @@
     <result property="cardinalId" column="CARDINAL_ID"/>
     <result property="oldId" column="OLD_ID"/>
     <result property="settleDomain" column="SETTLE_DOMAIN"/>
+    <result property="settleDomainCode" column="SETTLE_DOMAIN_CODE"/>
     <result property="socialProvince" column="SOCIAL_PROVINCE"/>
     <result property="socialCity" column="SOCIAL_CITY"/>
     <result property="socialTown" column="SOCIAL_TOWN"/>