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

增加连个

Browse Source
This commit is contained in:
wulin 2020-12-11 11:19:21 +08:00
parent 8a00d900fe
commit 95c02b47c3
4 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/lz/modules/job/business/DingtalkBusiness.java
View File

@ -31,8 +31,10 @@ import com.lz.modules.job.model.responseBo.DepartmentInfosBo;
import com.lz.modules.job.model.responseBo.DepartmentStaffBo; import com.lz.modules.job.model.responseBo.DepartmentStaffBo;
import com.lz.modules.performance.entity.ResultTask; import com.lz.modules.performance.entity.ResultTask;
import com.lz.modules.performance.entity.TaskComment; 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.ResultTaskService;
import com.lz.modules.performance.service.TaskCommentService; 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.dao.SysUserTokenDao;
import com.lz.modules.sys.entity.SysUserTokenEntity; import com.lz.modules.sys.entity.SysUserTokenEntity;
import com.lz.modules.sys.entity.app.ResultDetail; import com.lz.modules.sys.entity.app.ResultDetail;
@ -114,7 +116,7 @@ public class DingtalkBusiness {
private ResultTaskService resultTaskService; private ResultTaskService resultTaskService;
@Autowired @Autowired
private TaskCommentService taskCommentService; private TaskProcessRecordService taskProcessRecordService;
@Resource @Resource
StaffDao staffDao; StaffDao staffDao;
@ -702,14 +704,14 @@ public class DingtalkBusiness {
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; TaskProcessRecord taskProcessRecord = null;
if(taskId == null){ if(taskId == null){
taskComment = taskCommentService.selectTaskCommentByDetailId(detailId); taskProcessRecord = taskProcessRecordService.selectCommentTaskProcessRecordByDetailId(detailId);
}else{ }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()); StaffSimpleInfo toStaffSimpleInfo = staffService.selectStaffSimpleInfo(resultDetail.getStaffId());
ThirdAppConfig thirdAppConfig = thirdAppConfigService.getByAppId(appid); ThirdAppConfig thirdAppConfig = thirdAppConfigService.getByAppId(appid);
@ -743,7 +745,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) {

4
src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java
View File

@ -40,4 +40,8 @@ public interface TaskProcessRecordMapper extends BaseMapper<TaskProcessRecord> {
List<TaskProcessRecordDto> selectTaskProcessRecordsByTaskIds(@Param("page") IPage page, @Param("taskIds") List<Long> taskIds,@Param("useType") int useType); List<TaskProcessRecordDto> selectTaskProcessRecordsByTaskIds(@Param("page") IPage page, @Param("taskIds") List<Long> taskIds,@Param("useType") int useType);
List<TaskProcessRecord> selectByCondition(@Param("page") IPage page, @Param("taskModel") TaskModel taskModel); List<TaskProcessRecord> selectByCondition(@Param("page") IPage page, @Param("taskModel") TaskModel taskModel);
TaskProcessRecord selectCommentTaskProcessRecordByDetailId(@Param("detailId") Long detailId);
TaskProcessRecord selectCommentTaskProcessRecordByTaskId(@Param("taskId") Long taskId);
} }

4
src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java
View File

@ -41,4 +41,8 @@ public interface TaskProcessRecordService extends IService<TaskProcessRecord> {
int deleteTaskProcessRecordsByTaskId(Long taskId); int deleteTaskProcessRecordsByTaskId(Long taskId);
List<TaskProcessRecord> selectByCondition(IPage page, TaskModel taskModel); List<TaskProcessRecord> selectByCondition(IPage page, TaskModel taskModel);
TaskProcessRecord selectCommentTaskProcessRecordByDetailId(Long detailId);
TaskProcessRecord selectCommentTaskProcessRecordByTaskId(Long taskId);
} }

10
src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java
View File

@ -137,4 +137,14 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
public List<TaskProcessRecord> selectByCondition(IPage page, TaskModel taskModel) { public List<TaskProcessRecord> selectByCondition(IPage page, TaskModel taskModel) {
return taskProcessRecordMapper.selectByCondition(page,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);
}
} }