Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
87075420
Commit
87075420
authored
May 06, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.5.4-EKP-收款结算单-客服导出
parent
7dfcb77e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
TSalaryAccountMapper.xml
...ry-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
+2
-2
No files found.
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
View file @
87075420
...
...
@@ -702,7 +702,7 @@
,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(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
...
...
@@ -839,7 +839,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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment