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
6a6341da
Commit
6a6341da
authored
Apr 27, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.10' into MVP1.7.10
parents
e4e46564
b7842243
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
0 deletions
+9
-0
TAuditExportStandardVo.java
.../cloud/plus/v1/yifu/salary/vo/TAuditExportStandardVo.java
+2
-0
TSalaryAccountExportVo.java
.../cloud/plus/v1/yifu/salary/vo/TSalaryAccountExportVo.java
+3
-0
TSalaryAccountServiceImpl.java
...1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java
+3
-0
TSalaryAccountMapper.xml
...ry-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
+1
-0
No files found.
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TAuditExportStandardVo.java
View file @
6a6341da
...
@@ -22,4 +22,6 @@ public class TAuditExportStandardVo {
...
@@ -22,4 +22,6 @@ public class TAuditExportStandardVo {
private
String
businessPrimaryTyp
;
private
String
businessPrimaryTyp
;
private
String
businessSecondType
;
private
String
businessSecondType
;
private
String
businessThirdType
;
private
String
businessThirdType
;
//新增薪酬申请编号 fxj v1.7.10
private
String
applyNo
;
}
}
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryAccountExportVo.java
View file @
6a6341da
...
@@ -132,6 +132,9 @@ public class TSalaryAccountExportVo {
...
@@ -132,6 +132,9 @@ public class TSalaryAccountExportVo {
@ExcelProperty
(
"薪酬状态"
)
@ExcelProperty
(
"薪酬状态"
)
private
String
status
;
private
String
status
;
//新增薪酬申请编号 fxj v1.7.10 2025-04-25
@ExcelProperty
(
"薪酬申请单号"
)
private
String
applyNo
;
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java
View file @
6a6341da
...
@@ -343,6 +343,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
...
@@ -343,6 +343,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
standardItems
.
clear
();
standardItems
.
clear
();
}
}
}
}
//封装信息
//封装信息
initResult
(
list
,
itemExportVoMap
,
itemStandardMap
,
itemAnnualBonusMap
,
itemPersionTaxMap
,
itemAnnuityMap
,
itemSubsidyMap
,
itemCarNoTaxMap
);
initResult
(
list
,
itemExportVoMap
,
itemStandardMap
,
itemAnnualBonusMap
,
itemPersionTaxMap
,
itemAnnuityMap
,
itemSubsidyMap
,
itemCarNoTaxMap
);
if
(
i
%
CommonConstants
.
EXCEL_EXPORT_LIMIT
==
0
){
if
(
i
%
CommonConstants
.
EXCEL_EXPORT_LIMIT
==
0
){
...
@@ -588,6 +589,8 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
...
@@ -588,6 +589,8 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
vo
.
setBusinessPrimaryType
(
standardVo
.
getBusinessPrimaryTyp
());
vo
.
setBusinessPrimaryType
(
standardVo
.
getBusinessPrimaryTyp
());
vo
.
setBusinessSecondType
(
standardVo
.
getBusinessSecondType
());
vo
.
setBusinessSecondType
(
standardVo
.
getBusinessSecondType
());
vo
.
setBusinessThirdType
(
standardVo
.
getBusinessThirdType
());
vo
.
setBusinessThirdType
(
standardVo
.
getBusinessThirdType
());
//新增薪酬申请编号 fxj v1.7.10 2025-04-25
vo
.
setApplyNo
(
standardVo
.
getApplyNo
());
}
}
itemVo
=
itemAnnualBonusMap
.
get
(
vo
.
getId
());
itemVo
=
itemAnnualBonusMap
.
get
(
vo
.
getId
());
if
(
Common
.
isNotNull
(
itemVo
)){
if
(
Common
.
isNotNull
(
itemVo
)){
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
View file @
6a6341da
...
@@ -2032,6 +2032,7 @@
...
@@ -2032,6 +2032,7 @@
,s.BUSINESS_PRIMARY_TYPE as businessPrimaryType
,s.BUSINESS_PRIMARY_TYPE as businessPrimaryType
,s.BUSINESS_SECOND_TYPE as businessSecondType
,s.BUSINESS_SECOND_TYPE as businessSecondType
,s.BUSINESS_THIRD_TYPE as businessThirdType
,s.BUSINESS_THIRD_TYPE as businessThirdType
,s.APPLY_NO applyNo
FROM
FROM
t_salary_standard s
t_salary_standard s
where
where
...
...
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