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-12-22 16:10:41 +08:00
parent 2fee9f9a44
commit 74a47f44ce
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@ public enum WorkMsgTypeEnum {
TASK_COMMENT(13, "任务评论", "去查看", "# 任务评论\n ## @1评论了你的@2的任务"),
TASK_UPDATE(14, "任务更新", "去更新", "# 任务更新\n ## 记得每天来更新任务哦"),
TASK_REPLY_COMMENT(15, "任务评论", "去查看", "# 任务评论\n ## @1在@2的任务中@的了你"),
RESET(16, "重置流程", "去查看", "# 重置流程\n ## 重置流程"),
// 您的2020年10月绩效考核已经开始，请尽快制定绩效目标
// 吴林的2020年12月绩效考核的目标需要您确认，点击前往确认
;

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

@ -950,6 +950,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
private R reset(ApprovalDto approvalDto) {
switch (approvalDto.getResetFlag()) {
case 0: //0 重置到制定节点,所有数据会保留,重置到制定节点的后面跳过的节点需要重新执行
return resetNode(approvalDto);
@ -999,6 +1000,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
}
}
resultRecordService.resetData(resultRecord.getId(),2);
dingtalkBusiness.sendWorkMSGWithAsyn(resultRecord.getId(), WorkMsgTypeEnum.RESET.getType());
return R.ok();
}
@ -1038,9 +1040,8 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
ResultRecord resultRecord = resultRecordService.selectResultRecordById(resultRecordId);
resultRecord.setFlowProcess(0);
resultRecordService.updateResultRecordById(resultRecord);
resultRecordService.resetData(resultRecordId,approvalDto.getClearFlag());
dingtalkBusiness.sendWorkMSGWithAsyn(resultRecord.getId(), WorkMsgTypeEnum.RESET.getType());
return R.ok();
}