新增转正流程任务判断逻辑及关联服务
This commit is contained in:
parent
38c4fda5ce
commit
ecfd6098b2
@ -17,6 +17,7 @@ import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessI
|
||||
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.*;
|
||||
import cn.iocoder.yudao.module.bpm.convert.task.BpmTaskConvert;
|
||||
import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAEntryDO;
|
||||
import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOARegularDO;
|
||||
import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASalaryDO;
|
||||
import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASealDO;
|
||||
import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;
|
||||
@ -28,6 +29,7 @@ import cn.iocoder.yudao.module.bpm.service.definition.BpmModelService;
|
||||
import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
|
||||
import cn.iocoder.yudao.module.bpm.service.message.BpmMessageService;
|
||||
import cn.iocoder.yudao.module.bpm.service.oa.BpmOAEntryService;
|
||||
import cn.iocoder.yudao.module.bpm.service.oa.BpmOARegularService;
|
||||
import cn.iocoder.yudao.module.bpm.service.oa.BpmOASalaryService;
|
||||
import cn.iocoder.yudao.module.bpm.service.oa.BpmOASealService;
|
||||
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
|
||||
@ -117,6 +119,9 @@ public class BpmTaskServiceImpl implements BpmTaskService {
|
||||
@Resource
|
||||
private BpmOASalaryService bpmOASalaryService;
|
||||
|
||||
@Resource
|
||||
private BpmOARegularService bpmOARegularService;
|
||||
|
||||
@Override
|
||||
public PageResult<BpmTaskCCPageItemRespVO> getCCTaskPage(Long userId, BpmTaskDonePageReqVO pageVO) {
|
||||
// 查询被抄送的Task
|
||||
@ -555,7 +560,17 @@ public class BpmTaskServiceImpl implements BpmTaskService {
|
||||
if (salaryDO != null) {
|
||||
|
||||
DeptRespDTO dto = deptApi.getDept(salaryDO.getCompanyDeptId()).getCheckedData();
|
||||
paramMap.put("company_dept_flag", dto.getFlag()); //配置工厂idflag
|
||||
paramMap.put("company_dept_flag", dto.getFlag()); //配置工厂编号flag
|
||||
}
|
||||
}
|
||||
|
||||
// 判断 转正流程时
|
||||
if (instance.getProcessDefinitionId().contains("oa_regular")) {
|
||||
BpmOARegularDO regularDO = bpmOARegularService.getByProcessInstanceId(instance.getProcessInstanceId());
|
||||
if (regularDO != null) {
|
||||
|
||||
DeptRespDTO dto = deptApi.getDept(regularDO.getDeptId()).getCheckedData();
|
||||
paramMap.put("regular_dept_flag", dto.getFlag()); //配置转正部门flag
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user