Commit b53ac326 authored by hongguangwu's avatar hongguangwu

MVP1.5.4-EKP-收款结算单-客服导出

parent f54c3cbb
......@@ -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,38 @@ 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;
// 应发工资(导表金额)
private String fd_3bcdee91cacb6c;
}
......@@ -202,13 +202,30 @@
<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"/>
<result property="fd_3bcdee91cacb6c" column="fd_3bcdee91cacb6c"/>
</resultMap>
<sql id="Base_Column_List">
a.ID,
......@@ -673,8 +690,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 +699,22 @@
,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 SEPARATOR ';'),'') 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
,ifnull(if(a.RELAY_SALARY_UNIT is not null and a.RELAY_SALARY_UNIT != 0,a.RELAY_SALARY_UNIT,a.RELAY_SALARY),'0') fd_3bcdee91cacb6c
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 +729,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>
......@@ -806,7 +840,7 @@
a.SUM_SUPPORT_ELDERLY_MONEY as sumSupportElderlyMoney,
a.COST_REDUCTION as costReduction,
a.CREATE_NAME as createName,
GROUP_CONCAT(pdeduction.CN_NAME,':',pdeduction.SALARY_MONEY,';') pdeductionDetail,
GROUP_CONCAT(pdeduction.CN_NAME,':',pdeduction.SALARY_MONEY SEPARATOR ';') pdeductionDetail,
sum(ifnull(pdeduction.SALARY_MONEY,0)) pdeductionMoney,
if(a.PAY_SETTLE_FLAG = '0','已结算',if(a.PAY_SETTLE_FLAG = '1','结算中',if(a.PAY_SETTLE_FLAG = '2','未结算','-'))) paySettleFlag
from
......
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