diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java index e64ebe01..e37e9588 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java @@ -520,12 +520,15 @@ public class StaffRoleServiceImpl extends ServiceImpl staffMenuDepartmentList = staffMenuService.selectByParentId(RoleMenuEnums.DEPARTMENT_PM.getType()); if (CollectionUtils.isNotEmpty(staffMenuDepartmentList)) { staffMenus.addAll(staffMenuDepartmentList); } + flag = true; } if (CollectionUtils.isNotEmpty(staffRoleList)) { @@ -542,6 +545,7 @@ public class StaffRoleServiceImpl extends ServiceImpl 0) { List authIds = new ArrayList<>(); @@ -553,6 +557,9 @@ public class StaffRoleServiceImpl extends ServiceImpl flowRecords = flowRecordService.selectFlowRecordsByRecordIdAndStatus(recordId, 2); + if(flowRecords.size() > 0){ + List ids = flowRecords.stream().map(new Function() { + @Override + public Long apply(FlowRecord flowRecord) { + return flowRecord.getApprovalStaffId(); + } + }).collect(Collectors.toList()); + List staffs = staffService.selectNamesByIds(ids); + sendNoticeMsg(lzResultRecord, staffs); + return "OK"; + }*/ + return "error"; + } + public String sendTaskInputMsg(List staffs){ int m = 0; String userIds = ""; 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 5f6b4173..9683c6f8 100644 --- a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java +++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java @@ -9,6 +9,7 @@ import com.lz.modules.flow.entity.FlowStart; import com.lz.modules.flow.entity.StaffRole; import com.lz.modules.flow.service.EvaluationStartStaffService; import com.lz.modules.flow.service.StaffRoleService; +import com.lz.modules.job.business.DingtalkBusiness; import com.lz.modules.performance.req.AssessChangeReq; import com.lz.modules.performance.req.AssessListReq; import com.lz.modules.performance.req.AssessDetailReq; @@ -51,6 +52,9 @@ public class AssessManagerController extends AbstractController{ @Autowired private StaffRoleService staffRoleService; + @Autowired + private DingtalkBusiness dingtalkBusiness; + @PostMapping("assess/manager/list") @@ -157,4 +161,19 @@ public class AssessManagerController extends AbstractController{ } return R.ok(); } + + @GetMapping("assess/manager/Urging") + @ApiOperation("一键催办") + @ApiResponses({@ApiResponse(code = 200,message = "成功")}) + public R assessToScore(@RequestParam @ApiParam Long startId, @RequestParam @ApiParam Long flowProcess){ + try { + Long userId = getUserId(); + log.info("一键催办" + userId); + dingtalkBusiness.urging(startId, flowProcess, userId); + } catch (Exception e) { + log.error("开始评分异常" ,e); + return R.error(e.getMessage()); + } + return R.ok(); + } }