Commit 6b336834 authored by 赵啸非's avatar 赵啸非

修改自动考核

parent ea8270a3
...@@ -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.createUserId }}</span> <span>更新人员:</span><span>{{ val.createUserName }}</span>
</p> </p>
<div class="button_box"> <div class="button_box">
<el-button <el-button
......
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);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment