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

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-11-19 12:00:32 +08:00
parent 64c4e2ea6e
commit 78b009f600
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java
View File

@ -19,6 +19,8 @@ public enum WorkMsgTypeEnum {
START_WORK(6, "绩效考评待办事项", "去查看", "# 绩效目标制定\n ## @，你的绩效需要制定目标"), START_WORK(6, "绩效考评待办事项", "去查看", "# 绩效目标制定\n ## @，你的绩效需要制定目标"),
START_SCORE(7, "绩效考评待办事项", "去查看", "# 绩效结果输入\n ## @，你的绩效需要输入结果"), START_SCORE(7, "绩效考评待办事项", "去查看", "# 绩效结果输入\n ## @，你的绩效需要输入结果"),
PROCESS(8, "绩效考评待办事项", "去查看", "# @的绩效\n ## 需您去处理"), PROCESS(8, "绩效考评待办事项", "去查看", "# @的绩效\n ## 需您去处理"),
SKIP(9, "绩效跳过", "跳过", "# @的绩效\n ## 己经跳过"),
TRANSFER(10, "绩效转交", "转交", "# @的绩效\n ## 己经转交"),
// 您的2020年10月绩效考核已经开始，请尽快制定绩效目标 // 您的2020年10月绩效考核已经开始，请尽快制定绩效目标
// 吴林的2020年12月绩效考核的目标需要您确认，点击前往确认 // 吴林的2020年12月绩效考核的目标需要您确认，点击前往确认
; ;

7
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -930,6 +930,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
newSubmit(approvalDto,FlowRecordStatusEnums.SKIP_STATUS.getStatus()); newSubmit(approvalDto,FlowRecordStatusEnums.SKIP_STATUS.getStatus());
} }
flowChangeService.saveChange(approvalDto, flowRecord, 0); flowChangeService.saveChange(approvalDto, flowRecord, 0);
dingtalkBusiness.sendWorkMSGWithAsyn(flowRecord.getRecordId(), WorkMsgTypeEnum. SKIP.getType());
return R.ok("恭喜您，跳过成功。"); return R.ok("恭喜您，跳过成功。");
} }
@ -940,6 +941,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
flowRecord.setApprovalStaffId(staffEntity.getId()); flowRecord.setApprovalStaffId(staffEntity.getId());
flowRecord.setApprovalStaffName(staffEntity.getName()); flowRecord.setApprovalStaffName(staffEntity.getName());
flowRecordService.updateFlowRecordById(flowRecord); flowRecordService.updateFlowRecordById(flowRecord);
dingtalkBusiness.sendWorkMSGWithAsyn(flowRecord.getRecordId(), WorkMsgTypeEnum.TRANSFER.getType());
return R.ok("转交成功"); return R.ok("转交成功");
} }
@ -1074,13 +1076,12 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
return R.ok(); return R.ok();
} }
private R urge(ApprovalDto approvalDto) { private R urge(ApprovalDto approvalDto) {
ResultRecord resultRecord = resultRecordMapper.selectResultRecordById(approvalDto.getResultRecordId()); ResultRecord resultRecord = resultRecordMapper.selectResultRecordById(approvalDto.getResultRecordId());
if(!resultRecord.getCurrentApprovalStaffId().equals(approvalDto.getLoginUserId())){ if(!resultRecord.getCurrentApprovalStaffId().equals(approvalDto.getLoginUserId())){
log.info("催办" + resultRecord.getCurrentApprovalStaffId()); log.info("催办" + resultRecord.getCurrentApprovalStaffId());
StaffEntity mySelf = staffService.selectStaffById(resultRecord.getStaffId()); dingtalkBusiness.sendWorkMSGWithAsyn(resultRecord.getId(), WorkMsgTypeEnum.URGING.getType());
StaffEntity toSelf = staffService.selectStaffById(resultRecord.getCurrentApprovalStaffId());
resultRecordService.sendWorkMSG(mySelf, toSelf, WorkMsgTypeEnum.URGING, 0L, 2);
} }
return R.ok(); return R.ok();
} }