Commit 87075420 authored by hongguangwu's avatar hongguangwu

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

parent 7dfcb77e
...@@ -702,7 +702,7 @@ ...@@ -702,7 +702,7 @@
,ifnull(personalSocial.SALARY_MONEY,'') fd_3bcd41d0ae6648 ,ifnull(personalSocial.SALARY_MONEY,'') fd_3bcd41d0ae6648
,ifnull(personalFund.SALARY_MONEY,'') fd_3bcd41d65d5bb2 ,ifnull(personalFund.SALARY_MONEY,'') fd_3bcd41d65d5bb2
,ifnull(sum(ifnull(pdeduction.SALARY_MONEY,0)),'') fd_3bcd41d361534e ,ifnull(sum(ifnull(pdeduction.SALARY_MONEY,0)),'') fd_3bcd41d361534e
,ifnull(GROUP_CONCAT(pdeduction.CN_NAME,':',pdeduction.SALARY_MONEY,';'),'') fd_3bcd41dc41cf6a ,ifnull(GROUP_CONCAT(pdeduction.CN_NAME,':',pdeduction.SALARY_MONEY SEPARATOR ';'),'') fd_3bcd41dc41cf6a
,ifnull(personalDebt.SALARY_MONEY,0)*(-1) fd_3bcd41dfb9f00e ,ifnull(personalDebt.SALARY_MONEY,0)*(-1) fd_3bcd41dfb9f00e
,ifnull(a.ANNUAL_BONUS_TAX,'0') fd_3bcd41d939aa64 ,ifnull(a.ANNUAL_BONUS_TAX,'0') fd_3bcd41d939aa64
...@@ -839,7 +839,7 @@ ...@@ -839,7 +839,7 @@
a.SUM_SUPPORT_ELDERLY_MONEY as sumSupportElderlyMoney, a.SUM_SUPPORT_ELDERLY_MONEY as sumSupportElderlyMoney,
a.COST_REDUCTION as costReduction, a.COST_REDUCTION as costReduction,
a.CREATE_NAME as createName, 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, 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 if(a.PAY_SETTLE_FLAG = '0','已结算',if(a.PAY_SETTLE_FLAG = '1','结算中',if(a.PAY_SETTLE_FLAG = '2','未结算','-'))) paySettleFlag
from 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