Skip to content

A
attendance-performance-platform
Commit 6b336834 authored by 赵啸非's avatar 赵啸非
Browse files
Options

修改自动考核

parent ea8270a3
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 48 deletions
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.createUserId }}</span> <span>更新人员：</span><span>{{ val.createUserName }}</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
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.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
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.perform.model.*; import com.mortals.xhx.module.perform.model.*;
import com.mortals.xhx.module.perform.service.PerformRulesCategoryService; import com.mortals.xhx.module.perform.service.PerformRulesCategoryService;
...@@ -17,18 +21,19 @@ import com.mortals.framework.model.Context; ...@@ -17,18 +21,19 @@ import com.mortals.framework.model.Context;
import com.mortals.xhx.module.perform.dao.PerformStaffConfDao; import com.mortals.xhx.module.perform.dao.PerformStaffConfDao;
import com.mortals.xhx.module.perform.service.PerformStaffConfService; import com.mortals.xhx.module.perform.service.PerformStaffConfService;
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;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* PerformStaffConfService * PerformStaffConfService
* 人员自动考核信息 service实现 * 人员自动考核信息 service实现
* *
* @author zxfei * @author zxfei
* @date 2023-05-16 * @date 2023-05-16
*/ */
@Service("performStaffConfService") @Service("performStaffConfService")
@Slf4j @Slf4j
public class PerformStaffConfServiceImpl extends AbstractCRUDServiceImpl<PerformStaffConfDao, PerformStaffConfEntity, Long> implements PerformStaffConfService { public class PerformStaffConfServiceImpl extends AbstractCRUDServiceImpl<PerformStaffConfDao, PerformStaffConfEntity, Long> implements PerformStaffConfService {
...@@ -40,54 +45,56 @@ public class PerformStaffConfServiceImpl extends AbstractCRUDServiceImpl<Perform ...@@ -40,54 +45,56 @@ public class PerformStaffConfServiceImpl extends AbstractCRUDServiceImpl<Perform
@Autowired @Autowired
private PerformRulesCategoryService performRulesCategoryService; private PerformRulesCategoryService performRulesCategoryService;
@Autowired
private UserService userService;
@Override @Override
protected void saveBefore(PerformStaffConfEntity entity, Context context) throws AppException { protected void saveBefore(PerformStaffConfEntity entity, Context context) throws AppException {
super.saveBefore(entity,context); super.saveBefore(entity, context);
if(StringUtils.isNotEmpty(entity.getStaffIds())){ if (StringUtils.isNotEmpty(entity.getStaffIds())) {
List<Long> staffIdList = StringUtils.converStr2Long(entity.getStaffIds()); List<Long> staffIdList = StringUtils.converStr2Long(entity.getStaffIds());
StaffQuery staffQuery = new StaffQuery(); StaffQuery staffQuery = new StaffQuery();
staffQuery.setIdList(staffIdList); staffQuery.setIdList(staffIdList);
List<StaffEntity> staffEntityList = staffService.find(staffQuery); List<StaffEntity> staffEntityList = staffService.find(staffQuery);
if(CollectionUtils.isNotEmpty(staffEntityList)){ if (CollectionUtils.isNotEmpty(staffEntityList)) {
String names = ""; String names = "";
for (StaffEntity item:staffEntityList){ for (StaffEntity item : staffEntityList) {
names+=item.getName()+","; names += item.getName() + ",";
} }
entity.setStaffNames(names.substring(0,names.length()-1)); entity.setStaffNames(names.substring(0, names.length() - 1));
entity.setStaffCount(staffEntityList.size()); entity.setStaffCount(staffEntityList.size());
}else { } else {
entity.setStaffCount(0); entity.setStaffCount(0);
} }
} }
if(CollectionUtils.isNotEmpty(entity.getStaffConfDetail())){ if (CollectionUtils.isNotEmpty(entity.getStaffConfDetail())) {
Map<Integer,List<PerformStaffConfDetailEntity>> groupMap = entity.getStaffConfDetail().stream().collect(Collectors.groupingBy(PerformStaffConfDetailEntity::getType)); Map<Integer, List<PerformStaffConfDetailEntity>> groupMap = entity.getStaffConfDetail().stream().collect(Collectors.groupingBy(PerformStaffConfDetailEntity::getType));
if(groupMap.containsKey(CheckTypeEnum.考勤绩效.getValue())) { if (groupMap.containsKey(CheckTypeEnum.考勤绩效.getValue())) {
entity.setAttendCount(groupMap.get(CheckTypeEnum.考勤绩效.getValue()).size()); entity.setAttendCount(groupMap.get(CheckTypeEnum.考勤绩效.getValue()).size());
}else { } else {
entity.setAttendCount(0); entity.setAttendCount(0);
} }
if(groupMap.containsKey(CheckTypeEnum.评价绩效.getValue())) { if (groupMap.containsKey(CheckTypeEnum.评价绩效.getValue())) {
entity.setAssessCount(groupMap.get(CheckTypeEnum.评价绩效.getValue()).size()); entity.setAssessCount(groupMap.get(CheckTypeEnum.评价绩效.getValue()).size());
}else { } else {
entity.setAssessCount(0); entity.setAssessCount(0);
} }
if(groupMap.containsKey(CheckTypeEnum.办件绩效.getValue())) { if (groupMap.containsKey(CheckTypeEnum.办件绩效.getValue())) {
entity.setWorkCount(groupMap.get(CheckTypeEnum.办件绩效.getValue()).size()); entity.setWorkCount(groupMap.get(CheckTypeEnum.办件绩效.getValue()).size());
}else { } else {
entity.setWorkCount(0); entity.setWorkCount(0);
} }
if(groupMap.containsKey(CheckTypeEnum.效能绩效.getValue())) { if (groupMap.containsKey(CheckTypeEnum.效能绩效.getValue())) {
entity.setEffectCount(groupMap.get(CheckTypeEnum.效能绩效.getValue()).size()); entity.setEffectCount(groupMap.get(CheckTypeEnum.效能绩效.getValue()).size());
}else { } else {
entity.setEffectCount(0); entity.setEffectCount(0);
} }
if(groupMap.containsKey(CheckTypeEnum.其它绩效.getValue())) { if (groupMap.containsKey(CheckTypeEnum.其它绩效.getValue())) {
entity.setOtherCount(groupMap.get(CheckTypeEnum.其它绩效.getValue()).size()); entity.setOtherCount(groupMap.get(CheckTypeEnum.其它绩效.getValue()).size());
}else { } else {
entity.setOtherCount(0); entity.setOtherCount(0);
} }
} }
...@@ -95,37 +102,37 @@ public class PerformStaffConfServiceImpl extends AbstractCRUDServiceImpl<Perform ...@@ -95,37 +102,37 @@ public class PerformStaffConfServiceImpl extends AbstractCRUDServiceImpl<Perform
@Override @Override
protected void saveAfter(PerformStaffConfEntity entity, Context context) throws AppException { protected void saveAfter(PerformStaffConfEntity entity, Context context) throws AppException {
if(CollectionUtils.isNotEmpty(entity.getStaffConfDetail())){ if (CollectionUtils.isNotEmpty(entity.getStaffConfDetail())) {
for(PerformStaffConfDetailEntity item:entity.getStaffConfDetail()){ for (PerformStaffConfDetailEntity item : entity.getStaffConfDetail()) {
item.setStaffConfId(entity.getId()); item.setStaffConfId(entity.getId());
item.setCreateTime(entity.getCreateTime()); item.setCreateTime(entity.getCreateTime());
item.setCreateUser(entity.getCreateUser()); item.setCreateUser(entity.getCreateUser());
item.setId(null); item.setId(null);
PerformRulesCategoryEntity categoryEntity = performRulesCategoryService.get(item.getCategoryId()); PerformRulesCategoryEntity categoryEntity = performRulesCategoryService.get(item.getCategoryId());
if(categoryEntity!=null){ if (categoryEntity != null) {
item.setCategoryName(categoryEntity.getName()); item.setCategoryName(categoryEntity.getName());
} }
} }
performStaffConfDetailService.save(entity.getStaffConfDetail(),context); performStaffConfDetailService.save(entity.getStaffConfDetail(), context);
} }
} }
@Override @Override
protected void updateBefore(PerformStaffConfEntity entity, Context context) throws AppException { protected void updateBefore(PerformStaffConfEntity entity, Context context) throws AppException {
super.updateBefore(entity,context); super.updateBefore(entity, context);
if(StringUtils.isNotEmpty(entity.getStaffIds())){ if (StringUtils.isNotEmpty(entity.getStaffIds())) {
List<Long> staffIdList = StringUtils.converStr2Long(entity.getStaffIds()); List<Long> staffIdList = StringUtils.converStr2Long(entity.getStaffIds());
StaffQuery staffQuery = new StaffQuery(); StaffQuery staffQuery = new StaffQuery();
staffQuery.setIdList(staffIdList); staffQuery.setIdList(staffIdList);
List<StaffEntity> staffEntityList = staffService.find(staffQuery); List<StaffEntity> staffEntityList = staffService.find(staffQuery);
if(CollectionUtils.isNotEmpty(staffEntityList)){ if (CollectionUtils.isNotEmpty(staffEntityList)) {
String names = ""; String names = "";
for (StaffEntity item:staffEntityList){ for (StaffEntity item : staffEntityList) {
names+=item.getName()+","; names += item.getName() + ",";
} }
entity.setStaffNames(names.substring(0,names.length()-1)); entity.setStaffNames(names.substring(0, names.length() - 1));
entity.setStaffCount(staffEntityList.size()); entity.setStaffCount(staffEntityList.size());
}else { } else {
entity.setStaffCount(0); entity.setStaffCount(0);
} }
} }
...@@ -133,27 +140,32 @@ public class PerformStaffConfServiceImpl extends AbstractCRUDServiceImpl<Perform ...@@ -133,27 +140,32 @@ public class PerformStaffConfServiceImpl extends AbstractCRUDServiceImpl<Perform
@Override @Override
protected void updateAfter(PerformStaffConfEntity entity, Context context) throws AppException { protected void updateAfter(PerformStaffConfEntity entity, Context context) throws AppException {
if(CollectionUtils.isNotEmpty(entity.getStaffConfDetail())){ if (CollectionUtils.isNotEmpty(entity.getStaffConfDetail())) {
Long[] detailIds = performStaffConfDetailService.find(new PerformStaffConfDetailQuery().staffConfId(entity.getId())).stream().map(PerformStaffConfDetailEntity::getId).toArray(Long[]::new); Long[] detailIds = performStaffConfDetailService.find(new PerformStaffConfDetailQuery().staffConfId(entity.getId())).stream().map(PerformStaffConfDetailEntity::getId).toArray(Long[]::new);
performStaffConfDetailService.remove(detailIds,context); performStaffConfDetailService.remove(detailIds, context);
for(PerformStaffConfDetailEntity item:entity.getStaffConfDetail()){ for (PerformStaffConfDetailEntity item : entity.getStaffConfDetail()) {
item.setStaffConfId(entity.getId()); item.setStaffConfId(entity.getId());
item.setCreateTime(entity.getCreateTime()); item.setCreateTime(entity.getCreateTime());
item.setCreateUser(entity.getCreateUser()); item.setCreateUser(entity.getCreateUser());
item.setId(null); item.setId(null);
PerformRulesCategoryEntity categoryEntity = performRulesCategoryService.get(item.getCategoryId()); PerformRulesCategoryEntity categoryEntity = performRulesCategoryService.get(item.getCategoryId());
if(categoryEntity!=null){ if (categoryEntity != null) {
item.setCategoryName(categoryEntity.getName()); item.setCategoryName(categoryEntity.getName());
} }
} }
performStaffConfDetailService.save(entity.getStaffConfDetail(),context); performStaffConfDetailService.save(entity.getStaffConfDetail(), context);
} }
} }
@Override @Override
protected void findAfter(PerformStaffConfEntity params, PageInfo pageInfo, Context context, List<PerformStaffConfEntity> list) throws AppException { protected void findAfter(PerformStaffConfEntity params, PageInfo pageInfo, Context context, List<PerformStaffConfEntity> list) throws AppException {
if(CollectionUtils.isNotEmpty(list)){ Map<Long, UserEntity> userMap = userService.findToMap(new UserQuery(), context);
for (PerformStaffConfEntity item:list){ if (CollectionUtils.isNotEmpty(list)) {
for (PerformStaffConfEntity item : list) {
UserEntity userEntity = userMap.get(item.getCreateUserId());
if (!ObjectUtils.isEmpty(userEntity)) {
item.setCreateUserName(userEntity.getRealName());
}
List<PerformStaffConfDetailEntity> detailEntityList = performStaffConfDetailService.find(new PerformStaffConfDetailQuery().staffConfId(item.getId())); List<PerformStaffConfDetailEntity> detailEntityList = performStaffConfDetailService.find(new PerformStaffConfDetailQuery().staffConfId(item.getId()));
item.setStaffConfDetail(detailEntityList); item.setStaffConfDetail(detailEntityList);
} }
...@@ -163,7 +175,7 @@ public class PerformStaffConfServiceImpl extends AbstractCRUDServiceImpl<Perform ...@@ -163,7 +175,7 @@ public class PerformStaffConfServiceImpl extends AbstractCRUDServiceImpl<Perform
@Override @Override
public PerformStaffConfEntity get(Long key, Context context) throws AppException { public PerformStaffConfEntity get(Long key, Context context) throws AppException {
PerformStaffConfEntity entity = this.dao.get(key); PerformStaffConfEntity entity = this.dao.get(key);
if(entity!=null) { if (entity != null) {
List<PerformStaffConfDetailEntity> detailEntityList = performStaffConfDetailService.find(new PerformStaffConfDetailQuery().staffConfId(entity.getId())); List<PerformStaffConfDetailEntity> detailEntityList = performStaffConfDetailService.find(new PerformStaffConfDetailQuery().staffConfId(entity.getId()));
entity.setStaffConfDetail(detailEntityList); entity.setStaffConfDetail(detailEntityList);
} }
...@@ -172,11 +184,11 @@ public class PerformStaffConfServiceImpl extends AbstractCRUDServiceImpl<Perform ...@@ -172,11 +184,11 @@ public class PerformStaffConfServiceImpl extends AbstractCRUDServiceImpl<Perform
@Override @Override
protected void removeAfter(Long[] ids, Context context, int result) throws AppException { protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
if(ids != null && ids.length != 0){ if (ids != null && ids.length != 0) {
for (Long id:ids){ for (Long id : ids) {
PerformStaffConfDetailEntity condition = new PerformStaffConfDetailEntity(); PerformStaffConfDetailEntity condition = new PerformStaffConfDetailEntity();
condition.setStaffConfId(id); condition.setStaffConfId(id);
performStaffConfDetailService.remove(condition,context); performStaffConfDetailService.remove(condition, context);
} }
} }
} }
......
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