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
6b336834
Commit
6b336834
authored
Jul 16, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改自动考核
parent
ea8270a3
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
72 additions
and
48 deletions
+72
-48
attendance-performance-manager-ui/admin/src/views/perform/staff/conf/list.vue
...ce-manager-ui/admin/src/views/perform/staff/conf/list.vue
+1
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformDeptConfServiceImpl.java
...dule/perform/service/impl/PerformDeptConfServiceImpl.java
+12
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformStaffConfServiceImpl.java
...ule/perform/service/impl/PerformStaffConfServiceImpl.java
+59
-47
No files found.
attendance-performance-manager-ui/admin/src/views/perform/staff/conf/list.vue
View file @
6b336834
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
<span>
最近更新:
</span><span>
{{
val
.
createTime
}}
</span>
<span>
最近更新:
</span><span>
{{
val
.
createTime
}}
</span>
</p>
</p>
<p
class=
"goal_txt"
>
<p
class=
"goal_txt"
>
<span>
更新人员:
</span><span>
{{
val
.
createUser
Id
}}
</span>
<span>
更新人员:
</span><span>
{{
val
.
createUser
Name
}}
</span>
</p>
</p>
<div
class=
"button_box"
>
<div
class=
"button_box"
>
<el-button
<el-button
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformDeptConfServiceImpl.java
View file @
6b336834
package
com.mortals.xhx.module.perform.service.impl
;
package
com.mortals.xhx.module.perform.service.impl
;
import
com.mortals.framework.model.PageInfo
;
import
com.mortals.framework.model.PageInfo
;
import
com.mortals.xhx.base.system.user.model.UserEntity
;
import
com.mortals.xhx.base.system.user.model.UserQuery
;
import
com.mortals.xhx.base.system.user.service.UserService
;
import
com.mortals.xhx.common.code.CheckTypeEnum
;
import
com.mortals.xhx.common.code.CheckTypeEnum
;
import
com.mortals.xhx.module.dept.model.DeptEntity
;
import
com.mortals.xhx.module.dept.model.DeptEntity
;
import
com.mortals.xhx.module.dept.service.DeptService
;
import
com.mortals.xhx.module.dept.service.DeptService
;
...
@@ -18,6 +21,7 @@ import com.mortals.xhx.module.perform.dao.PerformDeptConfDao;
...
@@ -18,6 +21,7 @@ import com.mortals.xhx.module.perform.dao.PerformDeptConfDao;
import
com.mortals.xhx.module.perform.model.PerformDeptConfEntity
;
import
com.mortals.xhx.module.perform.model.PerformDeptConfEntity
;
import
com.mortals.xhx.module.perform.service.PerformDeptConfService
;
import
com.mortals.xhx.module.perform.service.PerformDeptConfService
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.util.ObjectUtils
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -40,11 +44,19 @@ public class PerformDeptConfServiceImpl extends AbstractCRUDServiceImpl<PerformD
...
@@ -40,11 +44,19 @@ public class PerformDeptConfServiceImpl extends AbstractCRUDServiceImpl<PerformD
private
DeptService
deptService
;
private
DeptService
deptService
;
@Autowired
@Autowired
private
PerformRulesCategoryService
performRulesCategoryService
;
private
PerformRulesCategoryService
performRulesCategoryService
;
@Autowired
private
UserService
userService
;
@Override
@Override
protected
void
findAfter
(
PerformDeptConfEntity
params
,
PageInfo
pageInfo
,
Context
context
,
List
<
PerformDeptConfEntity
>
list
)
throws
AppException
{
protected
void
findAfter
(
PerformDeptConfEntity
params
,
PageInfo
pageInfo
,
Context
context
,
List
<
PerformDeptConfEntity
>
list
)
throws
AppException
{
Map
<
Long
,
UserEntity
>
userMap
=
userService
.
findToMap
(
new
UserQuery
(),
context
);
if
(
CollectionUtils
.
isNotEmpty
(
list
)){
if
(
CollectionUtils
.
isNotEmpty
(
list
)){
for
(
PerformDeptConfEntity
item:
list
){
for
(
PerformDeptConfEntity
item:
list
){
UserEntity
userEntity
=
userMap
.
get
(
item
.
getCreateUserId
());
if
(!
ObjectUtils
.
isEmpty
(
userEntity
)){
item
.
setCreateUserName
(
userEntity
.
getRealName
());
}
List
<
PerformDeptConfDetailEntity
>
detailEntityList
=
performDeptConfDetailService
.
find
(
new
PerformDeptConfDetailQuery
().
deptConfId
(
item
.
getId
()));
List
<
PerformDeptConfDetailEntity
>
detailEntityList
=
performDeptConfDetailService
.
find
(
new
PerformDeptConfDetailQuery
().
deptConfId
(
item
.
getId
()));
item
.
setDeptConfDetail
(
detailEntityList
);
item
.
setDeptConfDetail
(
detailEntityList
);
}
}
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformStaffConfServiceImpl.java
View file @
6b336834
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