Merge remote-tracking branch 'origin/develop' into develop

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

@@ -253,4 +253,13 @@ public class EkpSalaryParam implements Serializable {
 	 * 税务主体
 	 **/
 	private String fd_3afab1895feea2;
+	/**
+	 * 代扣个人社保
+	 **/
+	private String fd_3b16ce48a9735c;
+	/**
+	 * 代扣个人公积金
+	 **/
+	private String fd_3b16ce4b7fc42a;
+
 }

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

+package com.yifu.cloud.plus.v1.yifu.ekp.vo;
+
+import lombok.Data;
+
+/**
+ * @Author fxj
+ * @Date 2022/8/22
+ * @Description 薪资明细对应参数
+ * @Version 1.0
+ */
+@Data
+public class EkpSalaryParamVo extends EkpSalaryParam {
+
+	/**
+	 * 社保扣缴月份
+	 **/
+	private String deduSocialMonth;
+	/**
+	 * 公积金扣缴月份
+	 **/
+	private String deduProvidentMonth;
+
+	/**
+	 * 代扣单位社保
+	 **/
+	private String unitSocial;
+	/**
+	 * 代扣单位公积金
+	 **/
+	private String unitFund;
+	/**
+	 * 代扣社保总额
+	 **/
+	private String socialSum;
+	/**
+	 * 代扣公积金总额
+	 **/
+	private String fundSum;
+
+}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryAccountMapper.java

@@ -20,7 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.salary.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam;
+import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParamVo;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.AccountCheckVo;
@@ -98,7 +98,7 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> {
 	 * @Date: 2022/8/29 16:52
 	 * @return: java.util.List<com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam>
 	 **/
-	List<EkpSalaryParam> getEkpSalaryParamList(@Param("salaryId") String salaryId);
+	List<EkpSalaryParamVo> getEkpSalaryParamList(@Param("salaryId") String salaryId);
 
 	List<TSalaryAccount> noPageDiy(@Param("searchVo") TSalaryAccountSearchVo searchVo,
 								   @Param("idList") List<String> idList);

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

@@ -20,7 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.salary.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam;
+import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParamVo;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryAccountSearchVo;
@@ -104,5 +104,5 @@ public interface TSalaryAccountService extends IService<TSalaryAccount> {
 	 * @Date: 2022/8/29 16:54
 	 * @return: java.util.List<com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam>
 	 **/
-	List<EkpSalaryParam> getEkpSalaryParamList(String salaryId);
+	List<EkpSalaryParamVo> getEkpSalaryParamList(String salaryId);
 }

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

@@ -26,7 +26,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil;
-import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam;
+import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParamVo;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
 import com.yifu.cloud.plus.v1.yifu.salary.mapper.TSalaryAccountMapper;
@@ -212,7 +212,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
 	}
 
 	@Override
-	public List<EkpSalaryParam> getEkpSalaryParamList(String salaryId) {
+	public List<EkpSalaryParamVo> getEkpSalaryParamList(String salaryId) {
 		return baseMapper.getEkpSalaryParamList(salaryId);
 	}
 

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

@@ -81,7 +81,7 @@
   </resultMap>
 
 	<!-- 对接EKP的参数 -->
-	<resultMap id="ekpSalaryParamVoMap" type="com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam">
+	<resultMap id="ekpSalaryParamVoMap" type="com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParamVo">
 		<result property="fd_3b10af838eab5c" column="fd_3b10af838eab5c"/>
 		<result property="fd_3adfedf98ccba2" column="fd_3adfedf98ccba2"/>
 		<result property="fd_3adfedf9d2bf1c" column="fd_3adfedf9d2bf1c"/>
@@ -144,6 +144,14 @@
 		<result property="fd_3aeadf1992544c" column="fd_3aeadf1992544c"/>
 		<result property="fd_3af9d49d165e90" column="fd_3af9d49d165e90"/>
 		<result property="fd_3afab1895feea2" column="fd_3afab1895feea2"/>
+		<result property="fd_3b16ce48a9735c" column="fd_3b16ce48a9735c"/>
+		<result property="fd_3b16ce4b7fc42a" column="fd_3b16ce4b7fc42a"/>
+		<result property="deduSocialMonth" column="DEDU_SOCIAL_MONTH"/>
+		<result property="deduProvidentMonth" column="DEDU_PROVIDENT_MONTH"/>
+		<result property="unitSocial" column="unit_social"/>
+		<result property="unitFund" column="unit_fund"/>
+		<result property="socialSum" column="social_sum"/>
+		<result property="fundSum" column="fund_sum"/>
 	</resultMap>
     <sql id="Base_Column_List">
                 a.ID,
@@ -504,6 +512,14 @@
 			 ,'' fd_3aeadf1992544c
 			 ,if(a.SALARY_GIVE_TIME='1','是','否') fd_3af9d49d165e90
 			 ,ifnull(a.INVOICE_TITLE,'') fd_3afab1895feea2
+			 ,ifnull(withholidingPersonSocial.SALARY_MONEY,'') fd_3b16ce48a9735c
+			 ,ifnull(withholidingPersonFund.SALARY_MONEY,'') fd_3b16ce4b7fc42a
+		     ,ifnull(withholidingUnitSocial.SALARY_MONEY,'') unit_social
+			 ,ifnull(withholidingUnitFund.SALARY_MONEY,'') unit_fund
+			 ,ifnull(withholidingUnitSocial.SALARY_MONEY,'0')+ifnull(withholidingPersonSocial.SALARY_MONEY,'0') social_sum
+			 ,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
 		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-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSendEkpError.java

@@ -48,7 +48,7 @@ public class TSendEkpError {
 	private String title;
 
 	@ExcelAttribute(name = "类型")
-	@ExcelProperty("类型（1薪资明细2预估明细3缴费明细4实时收入5定时收入）")
+	@ExcelProperty("类型（0:薪资代扣推送的社保公积金1薪资明细2预估明细3缴费明细4实时收入5定时收入）")
 	private String type;
 
 	@ExcelAttribute(name = "创建日")