Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
attendance-performance-platform
Commits
c066900a
Commit
c066900a
authored
Apr 11, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改员工职位字典
parent
0307763d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
0 deletions
+7
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java
...ava/com/mortals/xhx/module/staff/web/StaffController.java
+7
-0
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java
View file @
c066900a
...
@@ -4,6 +4,8 @@ import com.mortals.framework.exception.AppException;
...
@@ -4,6 +4,8 @@ import com.mortals.framework.exception.AppException;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.module.job.model.JobQuery
;
import
com.mortals.xhx.module.job.service.JobService
;
import
com.mortals.xhx.module.staff.model.StaffEntity
;
import
com.mortals.xhx.module.staff.model.StaffEntity
;
import
com.mortals.xhx.module.staff.model.vo.HolidayListVo
;
import
com.mortals.xhx.module.staff.model.vo.HolidayListVo
;
import
com.mortals.xhx.module.staff.model.vo.StaffInfoVo
;
import
com.mortals.xhx.module.staff.model.vo.StaffInfoVo
;
...
@@ -15,6 +17,8 @@ import org.springframework.web.bind.annotation.RestController;
...
@@ -15,6 +17,8 @@ import org.springframework.web.bind.annotation.RestController;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
/**
/**
*
*
* 员工基本信息
* 员工基本信息
...
@@ -28,6 +32,8 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
...
@@ -28,6 +32,8 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
@Autowired
@Autowired
private
ParamService
paramService
;
private
ParamService
paramService
;
@Autowired
private
JobService
jobService
;
public
StaffController
(){
public
StaffController
(){
super
.
setModuleDesc
(
"员工基本信息"
);
super
.
setModuleDesc
(
"员工基本信息"
);
...
@@ -39,6 +45,7 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
...
@@ -39,6 +45,7 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
this
.
addDict
(
model
,
"politicalstatus"
,
paramService
.
getParamBySecondOrganize
(
"Staff"
,
"politicalstatus"
));
this
.
addDict
(
model
,
"politicalstatus"
,
paramService
.
getParamBySecondOrganize
(
"Staff"
,
"politicalstatus"
));
this
.
addDict
(
model
,
"staffType"
,
paramService
.
getParamBySecondOrganize
(
"Staff"
,
"staffType"
));
this
.
addDict
(
model
,
"staffType"
,
paramService
.
getParamBySecondOrganize
(
"Staff"
,
"staffType"
));
this
.
addDict
(
model
,
"status"
,
paramService
.
getParamBySecondOrganize
(
"Staff"
,
"status"
));
this
.
addDict
(
model
,
"status"
,
paramService
.
getParamBySecondOrganize
(
"Staff"
,
"status"
));
this
.
addDict
(
model
,
"positionId"
,
jobService
.
find
(
new
JobQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getJobName
(),(
o
,
n
)->
n
)));
super
.
init
(
model
,
context
);
super
.
init
(
model
,
context
);
}
}
...
...
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