From 515b8a61d191a3e6e51ac8c86ce025c60ade65ed Mon Sep 17 00:00:00 2001 From: wulin Date: Wed, 16 Dec 2020 16:39:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=A9=E6=95=88=E7=AE=A1=E7=90=86=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=A2=9E=E5=8A=A0=E4=B8=80=E9=94=AE=E5=82=AC=E5=8A=9E?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/business/DingtalkBusiness.java | 48 ++++++++++++++++--- .../controller/AssessManagerController.java | 19 ++++++++ 2 files changed, 61 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java index 93f5950d..8d2bcacc 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -17,12 +17,8 @@ import com.lz.modules.app.service.DepartmentsService; import com.lz.modules.app.service.DepartmentsStaffRelateService; import com.lz.modules.app.service.StaffOccupationService; import com.lz.modules.app.service.StaffService; -import com.lz.modules.flow.entity.FlowChange; -import com.lz.modules.flow.entity.FlowRecord; -import com.lz.modules.flow.entity.FlowStart; -import com.lz.modules.flow.service.FlowChangeService; -import com.lz.modules.flow.service.FlowRecordService; -import com.lz.modules.flow.service.FlowStartService; +import com.lz.modules.flow.entity.*; +import com.lz.modules.flow.service.*; import com.lz.modules.job.model.responseBo.DepartmentInfosBo; import com.lz.modules.job.model.responseBo.DepartmentStaffBo; import com.lz.modules.performance.entity.TaskProcessRecord; @@ -108,6 +104,15 @@ public class DingtalkBusiness { @Autowired private TaskProcessRecordService taskProcessRecordService; + @Autowired + private StaffRoleService staffRoleService; + + @Autowired + private StaffRoleDepartmentService staffRoleDepartmentService; + + @Autowired + private StaffRoleEvaluationGroupService staffRoleEvaluationGroupService; + @Resource StaffDao staffDao; @@ -654,6 +659,37 @@ public class DingtalkBusiness { return "error"; } + //一键催办 + public String urging(Long startId, Long flowProcess, Long userId) { + + StaffRole staffRole = staffRoleService.selectStaffRoleById(userId); + if(staffRole == null){ + //不存在,那么看是否为部门领导 + }else{ + //查询管理的部门信息 + if(staffRole.getDepartmentId().intValue() != 0){ + + } + } + + + /*ResultRecord lzResultRecord = resultRecordService.selectResultRecordById(recordId); + //获取当前节点,谁在处理 + List 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(); + } }