From a3d18513a47c4db14b1093fa79989a5115c74462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 12 Nov 2020 09:48:49 +0800 Subject: [PATCH] fix --- .../controller/AssessManagerController.java | 30 +++++-------------- .../impl/AssessManagerServiceImpl.java | 17 +++++++++-- .../service/impl/ChartResultServiceImpl.java | 4 +++ 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java index c74ddb24..10b148b6 100644 --- a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java +++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java @@ -57,7 +57,8 @@ public class AssessManagerController extends AbstractController{ PageUtils pageUtils = assessManagerService.assessList(req); return R.ok().put("data",pageUtils); } catch (Exception e) { - return R.error(); + log.error("获取考核列表异常，",e); + return R.error(e.getMessage()); } } @@ -65,17 +66,14 @@ public class AssessManagerController extends AbstractController{ @ApiOperation("获取考核详情列表") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = AssessManagerDetailRes.class)}) public R assessDetail(@RequestBody AssessDetailReq req){ - if(req.getStartId()==null){ - return R.error("考核id不能为空"); - } - PageUtils pageUtils = null; + PageUtils pageUtils; try { Long userId = getUserId(); req.setLoginUserId(userId); pageUtils = assessManagerService.assessDetail(req); } catch (Exception e) { log.error("获取考核详情列表异常" ,e); - return R.error(); + return R.error(e.getMessage()); } return R.ok().put("data",pageUtils); @@ -87,17 +85,14 @@ public class AssessManagerController extends AbstractController{ @ApiOperation("获取考核详情列表人数统计") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStatistical.class)}) public R assessChart(@RequestBody AssessDetailReq req){ - if(req.getStartId()==null){ - return R.error("考核id不能为空"); - } - List process = null; + List process; try { Long userId = getUserId(); req.setLoginUserId(userId); process = chartResultService.countAssessNumByFlowProcess(req); } catch (Exception e) { log.error("获取详情顶部人数统计异常" ,e); - return R.error(); + return R.error(e.getMessage()); } return R.ok().put("data",process); @@ -108,15 +103,6 @@ public class AssessManagerController extends AbstractController{ @ApiOperation("考核管理组管理变更") @ApiResponses({@ApiResponse(code = 200,message = "成功"),@ApiResponse(code = 503,message = "去设置",response = StaffSimpleDto.class)}) public R assessChange(@RequestBody AssessChangeReq req){ - if(req.getStartId()==null){ - return R.error("考核id不能为空"); - } - if(req.getChangeType()==null){ - return R.error("变动类型无效"); - } - if(StringUtil.isBlank(req.getStaffIds())){ - return R.error("变动人员不能为空"); - } try { return assessManagerService.assessChange(req); } catch (Exception e) { @@ -142,7 +128,7 @@ public class AssessManagerController extends AbstractController{ assessManagerService.accessDelete(flowStart); } catch (Exception e) { log.error("删除考核任务异常, id:" + assessId ,e); - return R.error(); + return R.error(e.getMessage()); } return R.ok(); } @@ -155,7 +141,7 @@ public class AssessManagerController extends AbstractController{ assessManagerService.toScore(req); } catch (Exception e) { log.error("开始评分异常" ,e); - return R.error(); + return R.error(e.getMessage()); } return R.ok(); } diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java index 8d1c5fb8..2d27b116 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java @@ -138,6 +138,9 @@ public class AssessManagerServiceImpl implements AssessManagerService { @Override public PageUtils assessDetail(AssessDetailReq req) { + if(req.getStartId() == null ){ + throw new RRException("考核id不能为空"); + } //拼接拷贝组 if(StringUtil.isNotBlank(req.getEvaluationIds())){ req.setCopyEvaluationIds(evaluationGroupService.getEvaluationCopyIdsByEvaluationIds(req.getEvaluationIds(),req.getStartId())); @@ -180,6 +183,15 @@ public class AssessManagerServiceImpl implements AssessManagerService { @Override public R assessChange(AssessChangeReq req) { + if(req.getStartId()==null){ + throw new RRException("考核id不能为空"); + } + if(req.getChangeType()==null){ + throw new RRException("变动类型无效"); + } + if(StringUtil.isBlank(req.getStaffIds())){ + throw new RRException("变动人员不能为空"); + } FlowStart flowStart = flowStartMapper.selectFlowStartById(req.getStartId()); if(flowStart == null){ throw new RRException("暂无此考核组信息"); @@ -322,9 +334,10 @@ public class AssessManagerServiceImpl implements AssessManagerService { //通知评分 try { - dingtalkBusiness.sendWorkMSGWithAsyn(toStaffids, WorkMsgTypeEnum.START_SCORE.getType()); + String s = dingtalkBusiness.sendWorkMSGWithAsyn(toStaffids, WorkMsgTypeEnum.START_SCORE.getType()); + log.info("钉钉评分响应返回，res：" + s); } catch (Exception e) { - log.error("通知评分异常：",e); + log.error("通知评分异常：ids: " + JSON.toJSONString(toStaffids) + " ,e: " ,e); } diff --git a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java index 05b77272..c0319d69 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import com.lz.common.exception.RRException; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; import com.lz.common.utils.StringUtil; @@ -230,6 +231,9 @@ public class ChartResultServiceImpl implements ChartResultService { @Override public List countAssessNumByFlowProcess(AssessDetailReq req) { + if(req.getStartId()==null){ + throw new RRException("考核id不能为空"); + } req.setCopyEvaluationIds(evaluationGroupService.getEvaluationCopyIdsByEvaluationIds(req.getEvaluationIds(),req.getStartId())); //获取自己管理的部门 List mandepartmentIds = assessService.roleDepartments(req.getLoginUserId());