ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

追加 入职申请流程图的判断条件

Browse Source
This commit is contained in:
furongxin 2024-08-29 13:21:34 +08:00
parent 838ade5472
commit 06851126d2
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAEntryService.java
View File

@ -30,4 +30,11 @@ public interface BpmOAEntryService {
* @return 入职申请信息
*/
BpmOAEntryDO getEntry(Long id);
/**
* 获得入职申请
* @param processInstanceId 流程实例编号
* @return 入职申请信息
*/
BpmOAEntryDO getEntryByProcessInstanceId(String processInstanceId);
}

6
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAEntryServiceImpl.java
View File

@ -145,4 +145,10 @@ public class BpmOAEntryServiceImpl implements BpmOAEntryService{
return entryMapper.selectById(id);
}
@Override
public BpmOAEntryDO getEntryByProcessInstanceId(String processInstanceId) {
return entryMapper.selectOne(BpmOAEntryDO::getProcessInstanceId, processInstanceId);
}
}

16
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
View File

@ -16,6 +16,7 @@ import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceMyPageReqVO;
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.task.BpmProcessInstanceExtDO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO;
import cn.iocoder.yudao.module.bpm.dal.mysql.task.BpmProcessInstanceExtMapper;
@ -24,6 +25,7 @@ import cn.iocoder.yudao.module.bpm.enums.task.*;
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.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@ -102,6 +104,9 @@ public class BpmTaskServiceImpl implements BpmTaskService {
@Resource
private BpmProcessInstanceExtMapper processInstanceExtMapper;
@Resource
private BpmOAEntryService bpmOAEntryService;
@Override
public PageResult<BpmTaskCCPageItemRespVO> getCCTaskPage(Long userId, BpmTaskDonePageReqVO pageVO) {
// 查询被抄送的Task
@ -413,6 +418,17 @@ public class BpmTaskServiceImpl implements BpmTaskService {
// throw exception(TASK_OPERATE_FAIL_USER_NO_DEPT);
// }
// 判断 入职申请流程时
if (instance.getProcessDefinitionId().contains("oa_entry")) {
BpmOAEntryDO entryDO = bpmOAEntryService.getEntryByProcessInstanceId(instance.getProcessInstanceId());
if (entryDO != null) {
DeptRespDTO dto = deptApi.getDept(entryDO.getEntryDeptId()).getCheckedData();
paramMap.put("entry_dept_flag", dto.getFlag()); //配置入职部门flag
}
}
ArrayList<Long> list = new ArrayList<>(postIds);
// 只获配置的首个岗位
Long postId = list.get(0);