Skip to content

Y
yifu-mvp
Commit ff1c4e56 authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

Merge remote-tracking branch 'origin/MVP1.5.4' into MVP1.5.4

parents b6375d49 3e38b3c4
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 23 deletions
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpSalaryParam.java
View file @ ff1c4e56
......@@ -99,19 +99,19 @@ public class EkpSalaryParam implements Serializable {
**/
private String fd_3adfee1374ed7a;
/**
* 单位社保
* 单位社保（含代扣单位社保）
**/
private String fd_3adfee1e2b2f78;
/**
* 个人社保
* 个人社保（含代扣个人社保）
**/
private String fd_3adfee1e88723e;
/**
* 单位公积金
* 单位公积金（含代扣单位公积金）
**/
private String fd_3adfee1ee24680;
/**
* 个人公积金
* 个人公积金（含代扣个人公积金）
**/
private String fd_3adfee1f32fa24;
/**
......@@ -280,4 +280,36 @@ public class EkpSalaryParam implements Serializable {
**/
private String fd_3bbbfdd1fc2950;
// 客服导出额外字段
// 个人公积金（不含代扣）
private String fd_3bcd41d65d5bb2;
// 个人代扣明细
private String fd_3bcd41dc41cf6a;
// 单位待补足
private String fd_3bcd41dfb9f00e;
// 代扣单位社保
private String fd_3bcd41d857b764;
// 代扣个人年终奖税
private String fd_3bcd41d939aa64;
// 代扣当月个人税
private String fd_3bcd41d453de50;
// 免个税个人代扣
private String fd_3bcd41dd8b4232;
// 个人社保（不含代扣）
private String fd_3bcd41d0ae6648;
// 实发工资（银付）
private String fd_3bcd41d550a756;
// 单位公积金（不含代扣）
private String fd_3bcd41d1f6f58a;
// 暂停发金额
private String fd_3bcd41de98a582;
// 个人代扣合计
private String fd_3bcd41d361534e;
// 单位社保（不含代扣）
private String fd_3bcd41db081b72;
// 实发工资（现金）
private String fd_3bcd41da212afe;
// 代扣单位公积金
private String fd_3bcd41d77e4812;
}
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpSalaryParamVo.java
View file @ ff1c4e56
......@@ -19,15 +19,6 @@ public class EkpSalaryParamVo extends EkpSalaryParam {
* 公积金扣缴月份
**/
private String deduProvidentMonth;
/**
* 代扣单位社保
**/
private String unitSocial;
/**
* 代扣单位公积金
**/
private String unitFund;
/**
* 代扣社保总额
**/
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @ ff1c4e56
......@@ -408,15 +408,15 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
account.setId(sendParam.getFd_3b10af838eab5c());
// 社保
if ((Common.isNotNull(sendParam.getUnitSocial())
&& !CommonConstants.ZERO_STRING.equals(sendParam.getUnitSocial()))
if ((Common.isNotNull(sendParam.getFd_3bcd41d857b764())
&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3bcd41d857b764()))
||(Common.isNotNull(sendParam.getFd_3b16ce48a9735c())
&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3b16ce48a9735c()))) {
doSendForecastSocialToEkp(sendParam, s);
}
// 公积金
if ((Common.isNotNull(sendParam.getUnitFund())
&& !CommonConstants.ZERO_STRING.equals(sendParam.getUnitFund()))
if ((Common.isNotNull(sendParam.getFd_3bcd41d77e4812())
&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3bcd41d77e4812()))
|| (Common.isNotNull(sendParam.getFd_3b16ce4b7fc42a())
&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3b16ce4b7fc42a()))) {
doSendForecastFundToEkp(sendParam, s);
......@@ -627,7 +627,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
// 生成月份
socialParam.setFd_3adfe8cb96c41e(account.getDeduSocialMonth());
// 预估单位合计
socialParam.setFd_3adfeb4e8064a8(account.getUnitSocial());
socialParam.setFd_3adfeb4e8064a8(account.getFd_3bcd41d857b764());
// 预估个人合计
socialParam.setFd_3adfeb52a4d2e2(account.getFd_3b16ce48a9735c());
//应收
......@@ -763,7 +763,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
//员工身份证
socialParam.setFd_3adfe8c7e4cf7a(account.getFd_3adfedfb8f76d4());
// 预估单位代缴
socialParam.setFd_3adfeb4e8064a8(account.getUnitFund());
socialParam.setFd_3adfeb4e8064a8(account.getFd_3bcd41d77e4812());
// 预估个人代缴
socialParam.setFd_3adfeb52a4d2e2(account.getFd_3b16ce4b7fc42a());
//应收
......
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
View file @ ff1c4e56
......@@ -202,13 +202,29 @@
<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"/>
<result property="fd_3b178f0ded2114" column="fd_3b178f0ded2114"/>
<result property="fd_3b3bef19b61c38" column="fd_3b3bef19b61c38"/>
<result property="fd_3bbbfdd1fc2950" column="fd_3bbbfdd1fc2950"/>
<!-- 客服导出额外字段 -->
<result property="fd_3bcd41d65d5bb2" column="fd_3bcd41d65d5bb2"/>
<result property="fd_3bcd41dc41cf6a" column="fd_3bcd41dc41cf6a"/>
<result property="fd_3bcd41dfb9f00e" column="fd_3bcd41dfb9f00e"/>
<result property="fd_3bcd41d857b764" column="fd_3bcd41d857b764"/>
<result property="fd_3bcd41d939aa64" column="fd_3bcd41d939aa64"/>
<result property="fd_3bcd41d453de50" column="fd_3bcd41d453de50"/>
<result property="fd_3bcd41dd8b4232" column="fd_3bcd41dd8b4232"/>
<result property="fd_3bcd41d0ae6648" column="fd_3bcd41d0ae6648"/>
<result property="fd_3bcd41d550a756" column="fd_3bcd41d550a756"/>
<result property="fd_3bcd41d1f6f58a" column="fd_3bcd41d1f6f58a"/>
<result property="fd_3bcd41de98a582" column="fd_3bcd41de98a582"/>
<result property="fd_3bcd41d361534e" column="fd_3bcd41d361534e"/>
<result property="fd_3bcd41db081b72" column="fd_3bcd41db081b72"/>
<result property="fd_3bcd41da212afe" column="fd_3bcd41da212afe"/>
<result property="fd_3bcd41d77e4812" column="fd_3bcd41d77e4812"/>
</resultMap>
<sql id="Base_Column_List">
a.ID,
......@@ -673,8 +689,8 @@
,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,'') fd_3bcd41d857b764
,ifnull(withholidingUnitFund.SALARY_MONEY,'') fd_3bcd41d77e4812
,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
......@@ -682,6 +698,21 @@
,ifnull(s.BPO_FLAG,'') fd_3b178f0ded2114
,ifnull(s.APPLY_NO,'') fd_3b3bef19b61c38
,if(a.SALARY_STYLE='0','现金','银行') fd_3bbbfdd1fc2950
,ifnull(personalSocial.SALARY_MONEY,'') fd_3bcd41d0ae6648
,ifnull(personalFund.SALARY_MONEY,'') fd_3bcd41d65d5bb2
,ifnull(sum(ifnull(pdeduction.SALARY_MONEY,0)),'') fd_3bcd41d361534e
,ifnull(GROUP_CONCAT(pdeduction.CN_NAME,':',pdeduction.SALARY_MONEY,';'),'') fd_3bcd41dc41cf6a
,ifnull(personalDebt.SALARY_MONEY,0)*(-1) fd_3bcd41dfb9f00e
,ifnull(a.ANNUAL_BONUS_TAX,'0') fd_3bcd41d939aa64
,ifnull(a.SALARY_TAX,'0') + ifnull(a.SALARY_TAX_UNIT,'0') fd_3bcd41d453de50
,ifnull(exemptionPersionTax.SALARY_MONEY,0) fd_3bcd41dd8b4232
,if(a.SALARY_GIVE_TIME='0',if(a.SALARY_STYLE='0',ifnull(a.ACTUAL_SALARY,'0'),'0'),'0') fd_3bcd41da212afe
,if(a.SALARY_GIVE_TIME='0',if(a.SALARY_STYLE='0','0',ifnull(a.ACTUAL_SALARY,'0')),'0') fd_3bcd41d550a756
,if(a.SALARY_GIVE_TIME='1',ifnull(a.ACTUAL_SALARY,'0'),'0') fd_3bcd41de98a582
,ifnull(unitFund.SALARY_MONEY,'0') fd_3bcd41d1f6f58a
,ifnull(unitSocial.SALARY_MONEY,'0') fd_3bcd41db081b72
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'
......@@ -696,6 +727,7 @@
left join t_salary_account_item pdeduction on pdeduction.SALARY_ACCOUNT_ID = a.id and pdeduction.JAVA_FIED_NAME='pdeduction'
left join t_salary_account_item enterpriseAnnuity on enterpriseAnnuity.SALARY_ACCOUNT_ID = a.id and enterpriseAnnuity.JAVA_FIED_NAME='enterpriseAnnuity'
left join t_salary_account_item enterpriseAnnuityUnit on enterpriseAnnuityUnit.SALARY_ACCOUNT_ID = a.id and enterpriseAnnuityUnit.JAVA_FIED_NAME='enterpriseAnnuityUnit'
left join t_salary_account_item personalDebt on personalDebt.SALARY_ACCOUNT_ID = a.id and personalDebt.JAVA_FIED_NAME='personalDebt'
where a.DELETE_FLAG = 0 and a.SALARY_FORM_ID = #{salaryId} and a.SEND_STATUS = '0'
GROUP BY a.id
</select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment