Commit a31cd986 authored by hongguangwu's avatar hongguangwu

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

parent 3e38b3c4
...@@ -311,5 +311,7 @@ public class EkpSalaryParam implements Serializable { ...@@ -311,5 +311,7 @@ public class EkpSalaryParam implements Serializable {
private String fd_3bcd41da212afe; private String fd_3bcd41da212afe;
// 代扣单位公积金 // 代扣单位公积金
private String fd_3bcd41d77e4812; private String fd_3bcd41d77e4812;
// 应发工资(导表金额)
private String fd_3bcdee91cacb6c;
} }
...@@ -713,6 +713,7 @@ ...@@ -713,6 +713,7 @@
,if(a.SALARY_GIVE_TIME='1',ifnull(a.ACTUAL_SALARY,'0'),'0') fd_3bcd41de98a582 ,if(a.SALARY_GIVE_TIME='1',ifnull(a.ACTUAL_SALARY,'0'),'0') fd_3bcd41de98a582
,ifnull(unitFund.SALARY_MONEY,'0') fd_3bcd41d1f6f58a ,ifnull(unitFund.SALARY_MONEY,'0') fd_3bcd41d1f6f58a
,ifnull(unitSocial.SALARY_MONEY,'0') fd_3bcd41db081b72 ,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 from t_salary_account a
LEFT JOIN t_salary_standard s on a.SALARY_FORM_ID=s.ID 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' left join t_salary_account_item withholidingPersonSocial on withholidingPersonSocial.SALARY_ACCOUNT_ID = a.id and withholidingPersonSocial.JAVA_FIED_NAME='withholidingPersonSocial'
......
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