wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
杜建超 2020-11-12 17:19:17 +08:00
parent 0efa107ef7
commit 32e04d5b1f
3 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/lz/modules/performance/controller/AssessManagerController.java
View File

@ -138,6 +138,7 @@ public class AssessManagerController extends AbstractController{
@ApiResponses({@ApiResponse(code = 200,message = "成功")}) @ApiResponses({@ApiResponse(code = 200,message = "成功")})
public R assessToScore(@RequestBody @ApiParam AssessToScoreReq req){ public R assessToScore(@RequestBody @ApiParam AssessToScoreReq req){
try { try {
log.info("开始评分，当前登陆用户，userId：" + getUserId());
assessManagerService.toScore(req); assessManagerService.toScore(req);
} catch (Exception e) { } catch (Exception e) {
log.error("开始评分异常" ,e); log.error("开始评分异常" ,e);

14
src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
View File

@ -292,10 +292,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
log.info("更新evaluationStartStaff 数据 为已评分 " + i); log.info("更新evaluationStartStaff 数据 为已评分 " + i);
List<ToScoreDingTalkDto> dtos = resultRecordMapper.selectToScoreList(req.getStartId(), evaluation); List<ToScoreDingTalkDto> dtos = resultRecordMapper.selectToScoreList(req.getStartId(), evaluation);
if(CollectionUtils.isEmpty(dtos)){ if(CollectionUtils.isNotEmpty(dtos)){
log.info("该考评组无数据 evaluationId:" + evaluation);
continue;
}
log.info("本次评分更新操作 num: " + dtos.size()); log.info("本次评分更新操作 num: " + dtos.size());
dtos.forEach(dto -> { dtos.forEach(dto -> {
Long recordId = dto.getId(); Long recordId = dto.getId();
@ -317,8 +314,12 @@ public class AssessManagerServiceImpl implements AssessManagerService {
staffSimpleInfo.setStartId(req.getStartId()); staffSimpleInfo.setStartId(req.getStartId());
toStaffids.add(staffSimpleInfo); toStaffids.add(staffSimpleInfo);
}); });
}
else {
log.info("该考评组无数据 evaluationId:" + evaluation);
}
//更新flowRecord记录 //更新flowRecord记录
List<Object> objects = resultRecordService.listObjs(new QueryWrapper<ResultRecord>() List<Object> objects = resultRecordService.listObjs(new QueryWrapper<ResultRecord>()
.eq("is_delete", 0) .eq("is_delete", 0)
@ -332,6 +333,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
} }
if(CollectionUtils.isNotEmpty(toStaffids)){
//通知评分 //通知评分
try { try {
String s = dingtalkBusiness.sendWorkMSGWithAsyn(toStaffids, WorkMsgTypeEnum.START_SCORE.getType()); String s = dingtalkBusiness.sendWorkMSGWithAsyn(toStaffids, WorkMsgTypeEnum.START_SCORE.getType());
@ -339,7 +341,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
} catch (Exception e) { } catch (Exception e) {
log.error("通知评分异常：ids: " + JSON.toJSONString(toStaffids) + " ,e: " ,e); log.error("通知评分异常：ids: " + JSON.toJSONString(toStaffids) + " ,e: " ,e);
} }
}
} }

1
src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java
View File

@ -102,6 +102,7 @@ public class AssessServiceImpl implements AssessService {
log.info("获取 roleDepartment,staffRole: " + JSON.toJSONString(staffRole)); log.info("获取 roleDepartment,staffRole: " + JSON.toJSONString(staffRole));
// 0 标识全部部门 // 0 标识全部部门
if (staffRole.getDepartmentId() == 0) { if (staffRole.getDepartmentId() == 0) {
log.info("staffRole 为0，管理全部部门");
return null; return null;
} }
else { else {