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
30f19b8b
Commit
30f19b8b
authored
Jan 17, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.4-export里面的薪资导入人员
parent
050420e6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
244 additions
and
18 deletions
+244
-18
SalaryEmployeeImportVo.java
.../cloud/plus/v1/yifu/salary/vo/SalaryEmployeeImportVo.java
+21
-0
TSalaryEmployeeController.java
.../v1/yifu/salary/controller/TSalaryEmployeeController.java
+17
-0
TSalaryEmployeeService.java
...d/plus/v1/yifu/salary/service/TSalaryEmployeeService.java
+10
-0
TSalaryEmployeeServiceImpl.java
.../yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
+196
-18
No files found.
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/SalaryEmployeeImportVo.java
0 → 100644
View file @
30f19b8b
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
vo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryEmployee
;
import
lombok.Getter
;
import
lombok.Setter
;
import
java.util.List
;
/**
* @author hgw
* @description 薪资人员导入vo
* @date 2023/1/17
*/
@Getter
@Setter
public
class
SalaryEmployeeImportVo
{
private
List
<
TSalaryEmployee
>
empList
;
private
TSettleDomain
dept
;
private
String
isUpdate
;
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryEmployeeController.java
View file @
30f19b8b
...
...
@@ -29,6 +29,7 @@ import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryEmployee
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryEmployeeService
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryEmployeeImportVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryEmployeeExportVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryEmployeeSearchVo
;
import
io.swagger.v3.oas.annotations.Operation
;
...
...
@@ -180,4 +181,20 @@ public class TSalaryEmployeeController {
public
R
<
List
<
ErrorMessage
>>
batchUpdateSalaryEmployee
(
@RequestBody
MultipartFile
file
)
{
return
tSalaryEmployeeService
.
batchUpdateSalaryEmployee
(
file
.
getInputStream
());
}
/**
* @param vo
* @Description: 批量新增或更新人员
* @Author: hgw
* @Date: 2023/1/17 15:35
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.util.List < com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage>>
**/
@Operation
(
description
=
"批量新增或更新人员"
)
@SysLog
(
"批量新增或更新人员"
)
@PostMapping
(
"/importEmployee"
)
@PreAuthorize
(
"@pms.hasPermission('tsalaryemployee_import_employee')"
)
public
R
<
List
<
ErrorMessage
>>
importEmployee
(
@RequestBody
SalaryEmployeeImportVo
vo
)
{
return
tSalaryEmployeeService
.
importEmployee
(
vo
);
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryEmployeeService.java
View file @
30f19b8b
...
...
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryEmployee
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryEmployeeImportVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryEmployeeExportVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryEmployeeSearchVo
;
...
...
@@ -69,6 +70,15 @@ public interface TSalaryEmployeeService extends IService<TSalaryEmployee> {
**/
R
<
List
<
ErrorMessage
>>
batchUpdateSalaryEmployee
(
InputStream
inputStream
);
/**
* @param vo
* @Description: 批量新增或更新人员
* @Author: hgw
* @Date: 2023/1/17 15:38
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.util.List < com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage>>
**/
R
<
List
<
ErrorMessage
>>
importEmployee
(
SalaryEmployeeImportVo
vo
);
TSalaryEmployee
getByEmpIdCard
(
String
empIdCard
);
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @
30f19b8b
This diff is collapsed.
Click to expand it.
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