Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

This commit is contained in:
杜建超 2020-12-11 11:12:12 +08:00
commit bb52be4b98
2 changed files with 8 additions and 4 deletions

View File

@ -654,7 +654,12 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
} }
taskProcessRecord.setUseType(1); taskProcessRecord.setUseType(1);
taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord); taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord);
dingtalkBusiness.sendTaskNoticeMsg(taskProcessRecord.getDetailId(), taskProcessRecord.getTaskId()); try {
dingtalkBusiness.sendTaskNoticeMsg(taskProcessRecord.getDetailId(), taskProcessRecord.getTaskId());
} catch (Exception e) {
e.printStackTrace();
} finally {
}
return R.ok(); return R.ok();
} }

View File

@ -696,14 +696,13 @@ public class DingtalkBusiness {
m++; m++;
} }
} }
return "OK"; return "OK";
} }
public String sendTaskNoticeMsg(Long detailId, Long taskId) { public String sendTaskNoticeMsg(Long detailId, Long taskId) {
ResultDetail resultDetail = resultDetailService.selectResultDetailById(detailId); ResultDetail resultDetail = resultDetailService.selectResultDetailById(detailId);
logger.info("评论通知指标id{} 任务id{}", detailId, taskId); logger.info("评论通知指标id{} 任务id{}", detailId, taskId);
if(resultDetail != null){ /*if(resultDetail != null){
TaskComment taskComment = null; TaskComment taskComment = null;
if(taskId == null){ if(taskId == null){
taskComment = taskCommentService.selectTaskCommentByDetailId(detailId); taskComment = taskCommentService.selectTaskCommentByDetailId(detailId);
@ -744,7 +743,7 @@ public class DingtalkBusiness {
}else{ }else{
return "token无效"; return "token无效";
} }
} }*/
return "OK"; return "OK";
} }
public String sendNoticeMsg(ResultRecord lzResultRecord, List<StaffEntity> staffs) { public String sendNoticeMsg(ResultRecord lzResultRecord, List<StaffEntity> staffs) {