From 95c02b47c3fcbb0eb6e4ba9929f6204a1aa1147e Mon Sep 17 00:00:00 2001 From: wulin Date: Fri, 11 Dec 2020 11:19:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=9E=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/job/business/DingtalkBusiness.java | 16 +++++++++------- .../performance/dao/TaskProcessRecordMapper.java | 4 ++++ .../service/TaskProcessRecordService.java | 4 ++++ .../impl/TaskProcessRecordServiceImpl.java | 10 ++++++++++ 4 files changed, 27 insertions(+), 7 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 669d0a2d..4f03c873 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -31,8 +31,10 @@ import com.lz.modules.job.model.responseBo.DepartmentInfosBo; import com.lz.modules.job.model.responseBo.DepartmentStaffBo; import com.lz.modules.performance.entity.ResultTask; import com.lz.modules.performance.entity.TaskComment; +import com.lz.modules.performance.entity.TaskProcessRecord; import com.lz.modules.performance.service.ResultTaskService; import com.lz.modules.performance.service.TaskCommentService; +import com.lz.modules.performance.service.TaskProcessRecordService; import com.lz.modules.sys.dao.SysUserTokenDao; import com.lz.modules.sys.entity.SysUserTokenEntity; import com.lz.modules.sys.entity.app.ResultDetail; @@ -114,7 +116,7 @@ public class DingtalkBusiness { private ResultTaskService resultTaskService; @Autowired - private TaskCommentService taskCommentService; + private TaskProcessRecordService taskProcessRecordService; @Resource StaffDao staffDao; @@ -702,14 +704,14 @@ public class DingtalkBusiness { public String sendTaskNoticeMsg(Long detailId, Long taskId) { ResultDetail resultDetail = resultDetailService.selectResultDetailById(detailId); logger.info("评论通知指标id{}， 任务id{}", detailId, taskId); - /*if(resultDetail != null){ - TaskComment taskComment = null; + if(resultDetail != null){ + TaskProcessRecord taskProcessRecord = null; if(taskId == null){ - taskComment = taskCommentService.selectTaskCommentByDetailId(detailId); + taskProcessRecord = taskProcessRecordService.selectCommentTaskProcessRecordByDetailId(detailId); }else{ - taskComment = taskCommentService.selectTaskCommentByTaskId(taskId); + taskProcessRecord = taskProcessRecordService.selectCommentTaskProcessRecordByTaskId(taskId); } - StaffSimpleInfo fromStaffSimpleInfo = staffService.selectStaffSimpleInfo(taskComment.getStaffId()); + StaffSimpleInfo fromStaffSimpleInfo = staffService.selectStaffSimpleInfo(taskProcessRecord.getStaffId()); StaffSimpleInfo toStaffSimpleInfo = staffService.selectStaffSimpleInfo(resultDetail.getStaffId()); ThirdAppConfig thirdAppConfig = thirdAppConfigService.getByAppId(appid); @@ -743,7 +745,7 @@ public class DingtalkBusiness { }else{ return "token无效"; } - }*/ + } return "OK"; } public String sendNoticeMsg(ResultRecord lzResultRecord, List staffs) { diff --git a/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java index 13b02ae7..364a1d53 100644 --- a/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java @@ -40,4 +40,8 @@ public interface TaskProcessRecordMapper extends BaseMapper { List selectTaskProcessRecordsByTaskIds(@Param("page") IPage page, @Param("taskIds") List taskIds,@Param("useType") int useType); List selectByCondition(@Param("page") IPage page, @Param("taskModel") TaskModel taskModel); + + TaskProcessRecord selectCommentTaskProcessRecordByDetailId(@Param("detailId") Long detailId); + + TaskProcessRecord selectCommentTaskProcessRecordByTaskId(@Param("taskId") Long taskId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java b/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java index d2d9c1e0..dd4f857c 100644 --- a/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java +++ b/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java @@ -41,4 +41,8 @@ public interface TaskProcessRecordService extends IService { int deleteTaskProcessRecordsByTaskId(Long taskId); List selectByCondition(IPage page, TaskModel taskModel); + + TaskProcessRecord selectCommentTaskProcessRecordByDetailId(Long detailId); + + TaskProcessRecord selectCommentTaskProcessRecordByTaskId(Long taskId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java index 5327af7b..a0912730 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java @@ -137,4 +137,14 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl selectByCondition(IPage page, TaskModel taskModel) { return taskProcessRecordMapper.selectByCondition(page,taskModel); } + + @Override + public TaskProcessRecord selectCommentTaskProcessRecordByDetailId(Long detailId){ + return taskProcessRecordMapper.selectCommentTaskProcessRecordByDetailId(detailId); + } + + @Override + public TaskProcessRecord selectCommentTaskProcessRecordByTaskId(Long taskId){ + return taskProcessRecordMapper.selectCommentTaskProcessRecordByTaskId(taskId); + } }