薪资新增bpoflag

yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpSalaryParam.java

@@ -261,5 +261,9 @@ public class EkpSalaryParam implements Serializable {
 	 * 代扣个人公积金
 	 **/
 	private String fd_3b16ce4b7fc42a;
+	/**
+	 * 是否为BPO业务
+	 **/
+	private String fd_3b178f0ded2114;
 
 }

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java

@@ -17,6 +17,7 @@
 
 package com.yifu.cloud.plus.v1.yifu.salary.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -343,4 +344,12 @@ public class TSalaryStandard extends BaseEntity {
 	@Schema(description = "订单ID" )
 	@ExcelProperty("订单ID" )
 	private String orderId;
+
+	/**
+	 * EKP的 是否BPO：  是  否
+	 */
+	@Schema(description = "是否BPO")
+	@ExcelIgnore
+	private String bpoFlag;
+
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java

@@ -272,6 +272,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 			s.setSettlementMonth(sav.getSettlementMonth());
 			//s.setSettlementAmount()
 			s.setStatus(SalaryConstants.AUDIT_STATUS[0]);
+			s.setBpoFlag(dept.getBpoFlag());
 		}
 		return new R<>(s);
 	}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java

@@ -737,6 +737,8 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 		socialParam.setFd_3b01953871b8be(s.getInvoiceTitle());
 		//社保id
 		socialParam.setFd_3b0afbe1f94a08(account.getFd_3b10af838eab5c());
+		// 是否为BPO业务
+		socialParam.setFd_3b178dfcf9e3e6(s.getBpoFlag());
 		String sendBack = ekpSocialUtil.sendToEKP(socialParam);
 		if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
 			sendBack = ekpSocialUtil.sendToEKP(socialParam);
@@ -821,6 +823,8 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 		socialParam.setFd_3b019a2e9bfdd6(s.getInvoiceTitle());
 		// 公积金id
 		socialParam.setFd_3b0afbaf10df2c(account.getFd_3b10af838eab5c());
+		// 是否为BPO业务
+		socialParam.setFd_3b178ea361cabe(s.getBpoFlag());
 		String sendBack = ekpFundUtil.sendToEKP(socialParam);
 		if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
 			sendBack = ekpFundUtil.sendToEKP(socialParam);

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml

@@ -152,6 +152,7 @@
 		<result property="unitFund" column="unit_fund"/>
 		<result property="socialSum" column="social_sum"/>
 		<result property="fundSum" column="fund_sum"/>
+		<result property="fd_3b178f0ded2114" column="fd_3b178f0ded2114"/>
 	</resultMap>
     <sql id="Base_Column_List">
                 a.ID,
@@ -520,6 +521,7 @@
 			 ,ifnull(withholidingUnitFund.SALARY_MONEY,'0')+ifnull(withholidingPersonFund.SALARY_MONEY,'0') fund_sum
 			 ,concat(left(ifnull(a.DEDU_SOCIAL_MONTH,'1970'),4),'-',right(ifnull(a.DEDU_SOCIAL_MONTH,'02'),2)) DEDU_SOCIAL_MONTH
 			 ,concat(left(ifnull(a.DEDU_PROVIDENT_MONTH,'1970'),4),'-',right(ifnull(a.DEDU_PROVIDENT_MONTH,'02'),2)) DEDU_PROVIDENT_MONTH
+			,ifnull(s.BPO_FLAG,'') fd_3b178f0ded2114
 		from t_salary_account a
 			 LEFT JOIN t_salary_standard s on a.SALARY_FORM_ID=s.ID
 			 left join t_salary_account_item withholidingPersonSocial on withholidingPersonSocial.SALARY_ACCOUNT_ID = a.id and withholidingPersonSocial.JAVA_FIED_NAME='withholidingPersonSocial'

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml

@@ -73,6 +73,7 @@
     <result property="isRepeat" column="IS_REPEAT"/>
     <result property="repeatRemark" column="REPEAT_REMARK"/>
 	<result property="orderId" column="ORDER_ID"/>
+	<result property="bpoFlag" column="BPO_FLAG"/>
   </resultMap>
     <sql id="Base_Column_List">
                 a.ID,
@@ -124,7 +125,8 @@
                 a.IS_REPEAT,
                 a.REPEAT_REMARK,
 				a.INVOICE_TITLE,
-				a.ORDER_ID
+				a.ORDER_ID,
+				a.BPO_FLAG
     </sql>
     <sql id="tSalaryStandard_where">
         <if test="tSalaryStandard != null">