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
f6e26323
Commit
f6e26323
authored
Jul 05, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huyc 项目档案代码提交
parent
659e43fc
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
+12
-4
TEmployeeProjectController.java
.../yifu/archives/controller/TEmployeeProjectController.java
+1
-2
TEmployeeProjectService.java
...lus/v1/yifu/archives/service/TEmployeeProjectService.java
+3
-2
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+8
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeProjectController.java
View file @
f6e26323
...
...
@@ -40,7 +40,6 @@ import org.springframework.web.multipart.MultipartFile;
import
javax.servlet.http.HttpServletResponse
;
import
javax.validation.Valid
;
import
java.io.IOException
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -121,7 +120,7 @@ public class TEmployeeProjectController {
@PutMapping
@PreAuthorize
(
"@pms.hasPermission('archives_temployeeproject_edit')"
)
public
R
updateById
(
@RequestBody
TEmployeeProject
tEmployeeProject
)
{
return
R
.
ok
(
tEmployeeProjectService
.
update
ById
(
tEmployeeProject
));
return
R
.
ok
(
tEmployeeProjectService
.
update
Project
(
tEmployeeProject
));
}
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeProjectService.java
View file @
f6e26323
...
...
@@ -48,6 +48,8 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
R
saveEmp
(
TEmployeeProject
tEmployeeProject
);
R
updateProject
(
TEmployeeProject
tEmployeeProject
);
/**
* @param tEmployeeProject
* @Description: 减项
...
...
@@ -97,8 +99,7 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
List
<
TEmployeeProject
>
getListByEmpIdAndDeptNo
(
String
empId
,
String
deptNo
);
/**
* @param excelVOList
* @param bindingResult
* @param inputStream
* @Description: 批量更新项目档案
* @Author: huyc
* @Date: 2022/6/21 10:30
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
f6e26323
...
...
@@ -167,6 +167,14 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
return
R
.
failed
(
"未在人员档案中查到身份信息"
);
}
@Override
public
R
updateProject
(
TEmployeeProject
tEmployeeProject
)
{
TEmployeeProject
compareProject
=
this
.
getById
(
tEmployeeProject
.
getId
());
boolean
flag
=
this
.
updateById
(
tEmployeeProject
);
tEmployeeLogService
.
saveModificationRecord
(
CommonConstants
.
dingleDigitIntArray
[
1
],
""
,
tEmployeeProject
.
getId
(),
compareProject
,
tEmployeeProject
);
return
R
.
ok
(
flag
);
}
@Override
public
R
reEmpInfo
(
JSONObject
jsonObject
)
{
if
(
Common
.
isNotNull
(
jsonObject
))
{
...
...
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