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-21 16:15:25 +08:00
parent 2e373106da
commit 5b2853dcaa
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,12 +25,14 @@ import com.lz.modules.app.service.DepartmentsService;
import com.lz.modules.app.service.DepartmentsStaffRelateService; import com.lz.modules.app.service.DepartmentsStaffRelateService;
import com.lz.modules.app.service.StaffService; import com.lz.modules.app.service.StaffService;
import com.lz.modules.app.utils.t.TwoTuple; import com.lz.modules.app.utils.t.TwoTuple;
import com.lz.modules.flow.dao.FlowRecordMapper;
import com.lz.modules.flow.entity.*; import com.lz.modules.flow.entity.*;
import com.lz.modules.flow.enums.FlowRecordEnum; import com.lz.modules.flow.enums.FlowRecordEnum;
import com.lz.modules.flow.model.*; import com.lz.modules.flow.model.*;
import com.lz.modules.flow.service.*; import com.lz.modules.flow.service.*;
import com.lz.modules.job.business.DingtalkBusiness; import com.lz.modules.job.business.DingtalkBusiness;
import com.lz.modules.performance.dto.ResultTaskDto; import com.lz.modules.performance.dto.ResultTaskDto;
import com.lz.modules.performance.dto.TaskListDto;
import com.lz.modules.performance.req.OwnResultReq; import com.lz.modules.performance.req.OwnResultReq;
import com.lz.modules.performance.req.ResultUpdateTaskReq; import com.lz.modules.performance.req.ResultUpdateTaskReq;
import com.lz.modules.performance.res.ChartStatistical; import com.lz.modules.performance.res.ChartStatistical;
@ -107,6 +109,8 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
@Autowired @Autowired
private FlowRecordService flowRecordService; private FlowRecordService flowRecordService;
@Autowired
private FlowRecordMapper flowRecordMapper;
@Autowired @Autowired
private StaffRoleDepartmentService staffRoleDepartmentService; private StaffRoleDepartmentService staffRoleDepartmentService;
@ -900,6 +904,14 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
commentId = comment(approvalDto, flowChart); commentId = comment(approvalDto, flowChart);
} }
R r = apply(approvalDto); R r = apply(approvalDto);
if (approvalDto.getLoginUserId() != null) {
List<TaskListDto> taskListDtos = flowRecordMapper.selectTodoTasksByApprovalStaffId(approvalDto.getLoginUserId(), null);
if (taskListDtos != null && taskListDtos.size() > 0) {
TaskListDto taskListDto = taskListDtos.get(0);
r.put("resultRecordId", taskListDto.getRecordId());
}
}
r.put("waitTime", 3);
return r.put("commentId",commentId); return r.put("commentId",commentId);
} }