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
2593a2b1
Commit
2593a2b1
authored
Dec 17, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码优化-fxj
parent
81228113
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
TPaymentInfoNewVo.java
.../yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoNewVo.java
+8
-0
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+3
-0
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoNewVo.java
View file @
2593a2b1
...
...
@@ -359,6 +359,14 @@ public class TPaymentInfoNewVo extends RowIndex implements Serializable {
@ExcelProperty
(
"个人公积金费用"
)
private
BigDecimal
personalProvidentSum
;
/**
* 个人公积金比例
*/
@ExcelAttribute
(
name
=
"个人公积金比例"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"个人公积金比例"
)
private
BigDecimal
personalProvidentPercent
;
/**
* 公积金户
*/
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
2593a2b1
...
...
@@ -302,6 +302,7 @@
<result
property=
"unitProvidentSum"
column=
"UNIT_PROVIDENT_SUM"
/>
<result
property=
"personalProidentSet"
column=
"PERSONAL_PROIDENT_SET"
/>
<result
property=
"personalProvidentSum"
column=
"PERSONAL_PROVIDENT_SUM"
/>
<result
property=
"personalProvidentPercent"
column=
"PERSONAL_PROVIDENT_PERCENT"
/>
<result
property=
"unitSocialFundSum"
column=
"UNIT_SOCIAL_FUND_SUM"
/>
<result
property=
"socialFundPersonalSum"
column=
"SOCIAL_FUND_PERSONAL_SUM"
/>
<result
property=
"keyGroup"
column=
"keyGroup"
/>
...
...
@@ -1785,6 +1786,7 @@
a.UNIT_PROVIDENT_SET,
a.PROVIDENT_PERCENT,
a.PERSONAL_PROIDENT_SET,
a.PERSONAL_PROVIDENT_PERCENT,
a.UNIT_PROVIDENT_SUM,
if(null = a.UNIT_PENSION_MONEY,'',round(SUM(a.UNIT_PENSION_MONEY)/MAX(a.UNIT_PENSION_SET),4)) as UNIT_PENSION_PER,
if(null = a.UNIT_MEDICAL_MONEY,'',round(SUM(a.UNIT_MEDICAL_MONEY)/MAX(a.UNIT_MEDICAL_SET),4)) as UNIT_MEDICAL_PER,
...
...
@@ -1848,6 +1850,7 @@
a.UNIT_PROVIDENT_SET,
a.PROVIDENT_PERCENT,
a.PERSONAL_PROIDENT_SET,
a.PERSONAL_PROVIDENT_PERCENT,
SUM( a.UNIT_PROVIDENT_SUM ) AS UNIT_PROVIDENT_SUM,
'' as UNIT_PENSION_PER,
'' as UNIT_MEDICAL_PER,
...
...
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