From 513ede5708239f290791a9427487b92c670c7519 Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 12 Nov 2020 12:38:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=AD=E9=80=94?= =?UTF-8?q?=E6=8F=92=E5=85=A5=E7=BB=A9=E6=95=88=E6=97=B6=EF=BC=8C=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=8C=87=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flow/dao/ResultTagetLibMapper.java | 2 +- .../service/impl/FlowStartServiceImpl.java | 19 ++++++++++++++++--- .../service/ResultTagetLibService.java | 2 +- .../impl/ResultTagetLibServiceImpl.java | 4 ++-- .../mapper/flow/ResultTagetLibMapper.xml | 2 +- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java b/src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java index 3c7cae1c..5c3d8f1d 100644 --- a/src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java @@ -37,7 +37,7 @@ public interface ResultTagetLibMapper extends BaseMapper { int deleteResultTagetLibById(@Param("id")Long id); - List selectResultTagetLibByModelId(Long id); + List selectResultTagetLibByModelId(Long id); List selectByCondition(@Param("page") IPage page, @Param("req") ResultTagetLibSearchReq req); diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java index 54756f5f..230044e9 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java @@ -383,9 +383,21 @@ public class FlowStartServiceImpl extends ServiceImpl resultTagetLibDtos = resultTagetLibService.selectResultTagetLibDtoByModelId(modelDto.getId()); + modelDto.setTagetLibs(resultTagetLibDtos); + } + //以下代码没必要更新，因为这个拷贝分用不到。正确的对应关系清查看lz_evaluation_start_staff //evaluationGroup.setStaffIds(evaluationGroup.getStaffIds() + ","); @@ -424,6 +436,8 @@ public class FlowStartServiceImpl extends ServiceImpl { int deleteResultTagetLibById(Long id); - List selectResultTagetLibByModelId(Long id); + List selectResultTagetLibByModelId(Long id); PageUtils selectResultTagetLibByReq(ResultTagetLibSearchReq req); diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java index 341f6aa2..50370d6b 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java @@ -55,7 +55,7 @@ public class ResultTagetLibServiceImpl extends ServiceImpl resultTagetLibDtos = selectResultTagetLibByModelId(resultModel.getId()); + List resultTagetLibDtos = selectResultTagetLibDtoByModelId(resultModel.getId()); BigDecimal weight = BigDecimal.ZERO; for(int i = 0; i < resultTagetLibDtos.size(); i++){ ResultTagetLibDto dto = resultTagetLibDtos.get(i); @@ -92,7 +92,7 @@ public class ResultTagetLibServiceImpl extends ServiceImpl selectResultTagetLibByModelId(Long id){ + public List selectResultTagetLibByModelId(Long id){ return resultTagetLibMapper.selectResultTagetLibByModelId(id); } diff --git a/src/main/resources/mapper/flow/ResultTagetLibMapper.xml b/src/main/resources/mapper/flow/ResultTagetLibMapper.xml index f4a1edd6..bf1fd63e 100644 --- a/src/main/resources/mapper/flow/ResultTagetLibMapper.xml +++ b/src/main/resources/mapper/flow/ResultTagetLibMapper.xml @@ -89,7 +89,7 @@ update lz_result_taget_lib set is_delete = 1 where id=#{id} limit 1 - select * from lz_result_taget_lib where model_id=#{id} and is_delete = 0 order by order_by desc From f1137746162291098ab18d299e5c645ecab9b95e Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 12 Nov 2020 12:48:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/flow/service/impl/ResultModelServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java index 7c117d67..f40b8f43 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java @@ -181,7 +181,7 @@ public class ResultModelServiceImpl extends ServiceImpl Date: Thu, 12 Nov 2020 13:57:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E7=9A=84=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java | 1 + .../java/com/lz/modules/flow/service/FlowChartService.java | 2 ++ .../lz/modules/flow/service/impl/FlowChartServiceImpl.java | 6 ++++++ .../modules/performance/controller/FlowChartController.java | 4 ++-- src/main/resources/mapper/flow/FlowChartMapper.xml | 6 ++++++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java b/src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java index 4dbb61ea..110deb97 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java @@ -43,4 +43,5 @@ public interface FlowChartMapper extends BaseMapper { List selectFlowChartsByGroupId(Long groupId); + List selectCanSetChartRoleByChartId(Long id); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/FlowChartService.java b/src/main/java/com/lz/modules/flow/service/FlowChartService.java index c3a3e84a..7ad4b0ab 100644 --- a/src/main/java/com/lz/modules/flow/service/FlowChartService.java +++ b/src/main/java/com/lz/modules/flow/service/FlowChartService.java @@ -41,4 +41,6 @@ public interface FlowChartService extends IService { List selectFlowChartDtoByFlowManagerId(Long id); List selectFlowChartsByGroupId(Long groupId); + + List selectCanSetChartRoleByChartId(Long id); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowChartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowChartServiceImpl.java index 57865106..d3539334 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowChartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowChartServiceImpl.java @@ -82,6 +82,12 @@ public class FlowChartServiceImpl extends ServiceImpl selectCanSetChartRoleByChartId(Long id) + { + return flowChartMapper.selectCanSetChartRoleByChartId(id); + } + } diff --git a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java index 2f066aba..063e2980 100644 --- a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java @@ -57,8 +57,8 @@ public class FlowChartController { List flowChartDtos = flowChartService.selectFlowChartDtoByFlowManagerId(flowManager.getId()); for (FlowChartDto dto:flowChartDtos ) { - List flowCharts = flowChartService.selectChartRoleByChartId(dto.getId()); - dto.setRoleDtos(flowCharts); + List flowChartRoles = flowChartService.selectCanSetChartRoleByChartId(dto.getId()); + dto.setRoleDtos(flowChartRoles); if(groupId > 0){ //获取节点已保存的数据 FlowChartDetailRecordListDto flowChartDetailRecordListDto = new FlowChartDetailRecordListDto(); diff --git a/src/main/resources/mapper/flow/FlowChartMapper.xml b/src/main/resources/mapper/flow/FlowChartMapper.xml index 7cf2e556..948bfa61 100644 --- a/src/main/resources/mapper/flow/FlowChartMapper.xml +++ b/src/main/resources/mapper/flow/FlowChartMapper.xml @@ -119,5 +119,11 @@ ) and is_delete=0 order by step_index asc + + From 32e04d5b1f1c013c5f90e6af64009cbb1c80bc58 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 17:19:17 +0800 Subject: [PATCH 4/4] fix --- .../controller/AssessManagerController.java | 1 + .../impl/AssessManagerServiceImpl.java | 68 ++++++++++--------- .../service/impl/AssessServiceImpl.java | 1 + 3 files changed, 37 insertions(+), 33 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 10b148b6..facbc770 100644 --- a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java +++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java @@ -138,6 +138,7 @@ public class AssessManagerController extends AbstractController{ @ApiResponses({@ApiResponse(code = 200,message = "成功")}) public R assessToScore(@RequestBody @ApiParam AssessToScoreReq req){ try { + log.info("开始评分，当前登陆用户，userId：" + getUserId()); assessManagerService.toScore(req); } catch (Exception e) { log.error("开始评分异常" ,e); 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 2d27b116..938b61b2 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 @@ -292,33 +292,34 @@ public class AssessManagerServiceImpl implements AssessManagerService { log.info("更新evaluationStartStaff 数据 为已评分 " + i); List dtos = resultRecordMapper.selectToScoreList(req.getStartId(), evaluation); - if(CollectionUtils.isEmpty(dtos)){ - log.info("该考评组无数据 evaluationId:" + evaluation); - continue; + if(CollectionUtils.isNotEmpty(dtos)){ + log.info("本次评分更新操作 num: " + dtos.size()); + dtos.forEach(dto -> { + Long recordId = dto.getId(); + //更新流程绩效 + ApprovalDto approvalDto = new ApprovalDto(); + approvalDto.setStatus(1); + approvalDto.setResultRecordId(recordId); + approvalDto.setMenuName("开始评分"); + try { + R r = resultRecordService.newApproval(approvalDto); + log.info("绩效id aLong :" + recordId + " ,res" + JSON.toJSONString(r)); + } catch (Exception e) { + log.error("执行中状态跳过失败 recorId:" + recordId,e); + } + //钉钉通知评分构建 + StaffSimpleInfo staffSimpleInfo = new StaffSimpleInfo(); + staffSimpleInfo.setId(dto.getStaffId()); + staffSimpleInfo.setRecordId(recordId); + staffSimpleInfo.setStartId(req.getStartId()); + toStaffids.add(staffSimpleInfo); + + }); + } + else { + log.info("该考评组无数据 evaluationId:" + evaluation); } - log.info("本次评分更新操作 num: " + dtos.size()); - dtos.forEach(dto -> { - Long recordId = dto.getId(); - //更新流程绩效 - ApprovalDto approvalDto = new ApprovalDto(); - approvalDto.setStatus(1); - approvalDto.setResultRecordId(recordId); - approvalDto.setMenuName("开始评分"); - try { - R r = resultRecordService.newApproval(approvalDto); - log.info("绩效id aLong :" + recordId + " ,res" + JSON.toJSONString(r)); - } catch (Exception e) { - log.error("执行中状态跳过失败 recorId:" + recordId,e); - } - //钉钉通知评分构建 - StaffSimpleInfo staffSimpleInfo = new StaffSimpleInfo(); - staffSimpleInfo.setId(dto.getStaffId()); - staffSimpleInfo.setRecordId(recordId); - staffSimpleInfo.setStartId(req.getStartId()); - toStaffids.add(staffSimpleInfo); - - }); //更新flowRecord记录 List objects = resultRecordService.listObjs(new QueryWrapper() .eq("is_delete", 0) @@ -331,15 +332,16 @@ public class AssessManagerServiceImpl implements AssessManagerService { log.info("更新flowRecord记录,i:" + updateExecution); } - - //通知评分 - try { - String s = dingtalkBusiness.sendWorkMSGWithAsyn(toStaffids, WorkMsgTypeEnum.START_SCORE.getType()); - log.info("钉钉评分响应返回，res：" + s); - } catch (Exception e) { - log.error("通知评分异常：ids: " + JSON.toJSONString(toStaffids) + " ,e: " ,e); - } + if(CollectionUtils.isNotEmpty(toStaffids)){ + //通知评分 + try { + String s = dingtalkBusiness.sendWorkMSGWithAsyn(toStaffids, WorkMsgTypeEnum.START_SCORE.getType()); + log.info("钉钉评分响应返回，res：" + s); + } catch (Exception e) { + log.error("通知评分异常：ids: " + JSON.toJSONString(toStaffids) + " ,e: " ,e); + } + } } diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java index bc991250..3d5c58db 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java @@ -102,6 +102,7 @@ public class AssessServiceImpl implements AssessService { log.info("获取 roleDepartment,staffRole: " + JSON.toJSONString(staffRole)); // 0 标识全部部门 if (staffRole.getDepartmentId() == 0) { + log.info("staffRole 为0，管理全部部门"); return null; } else {