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
7c3071e4
You need to sign in or sign up before continuing.
Commit
7c3071e4
authored
Sep 19, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.10工资相关
parent
6cb8bc44
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
0 deletions
+11
-0
SalaryUploadOriginalParamVo.java
...d/plus/v1/yifu/salary/vo/SalaryUploadOriginalParamVo.java
+4
-0
SalaryUploadParamVo.java
...ifu/cloud/plus/v1/yifu/salary/vo/SalaryUploadParamVo.java
+3
-0
SalaryUploadServiceImpl.java
.../v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
+3
-0
TSalaryStandardOriginalServiceImpl.java
...lary/service/impl/TSalaryStandardOriginalServiceImpl.java
+1
-0
No files found.
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/SalaryUploadOriginalParamVo.java
View file @
7c3071e4
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandardIssueRes
;
import
lombok.Getter
;
import
lombok.Setter
;
...
...
@@ -47,4 +48,7 @@ public class SalaryUploadOriginalParamVo {
// 新员工是否更新:0否;1是
String
newEmpUpdateFlag
;
// @ExcelProperty("是否固定列")
Integer
isFixedColumn
;
}
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/SalaryUploadParamVo.java
View file @
7c3071e4
...
...
@@ -53,4 +53,7 @@ public class SalaryUploadParamVo {
// 新员工是否更新:0否;1是
String
newEmpUpdateFlag
;
// @ExcelProperty("是否固定列")
Integer
isFixedColumn
;
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
View file @
7c3071e4
...
...
@@ -360,6 +360,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
if
(
Common
.
isNotNull
(
vo
.
getOriginalSetName
())){
salary
.
setOriginalSetName
(
vo
.
getOriginalSetName
());
}
if
(
Common
.
isNotNull
(
vo
.
getIsFixedColumn
())){
salary
.
setIsFixedColumn
(
vo
.
getIsFixedColumn
());
}
// 薪资导入、删除前加锁:
TSalaryLock
lock
=
salaryLockService
.
lambdaQuery
()
.
eq
(
TSalaryLock:
:
getDeptId
,
dept
.
getId
())
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardOriginalServiceImpl.java
View file @
7c3071e4
...
...
@@ -1078,6 +1078,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
returnVo
.
setSetName
(
excelVo
.
getSetName
());
returnVo
.
setOriginalSetName
(
excelVo
.
getOriginalSetName
());
returnVo
.
setNewEmpUpdateFlag
(
excelVo
.
getNewEmpUpdateFlag
());
returnVo
.
setIsFixedColumn
(
excelVo
.
getIsFixedColumn
());
//数据保存
return
R
.
ok
(
returnVo
);
}
...
...
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