diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlow.java index 7d060eac..f6acd12f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlow.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlow.java @@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.esdeclare.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.activiti.entity.ProcessAll; +import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.process.esdeclare.entity.ProcessEsDeclare; import com.jero.modules.activiti.process.esdeclare.service.IProcessEsDeclareService; import com.jero.modules.activiti.service.WorkCenterService; @@ -33,4 +34,9 @@ public class EsDeclareFlow implements WorkCenterService { new LambdaQueryWrapper() .eq(ProcessEsDeclare::getProjectId, processAll.getProjectId())); } + + @Override + public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { + + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlow.java index 5bb9f7c3..3b6ecd42 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlow.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlow.java @@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.esinspect.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.activiti.entity.ProcessAll; +import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.process.esinspect.entity.ProcessEsInspect; import com.jero.modules.activiti.process.esinspect.service.IProcessEsInspectService; import com.jero.modules.activiti.service.WorkCenterService; @@ -33,4 +34,9 @@ public class EsInspectFlow implements WorkCenterService { new LambdaQueryWrapper() .eq(ProcessEsInspect::getProjectId, processAll.getProjectId())); } + + @Override + public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { + + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlow.java index dd1e2b21..9e3aff5f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlow.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlow.java @@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.esinspectdelayapply.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.activiti.entity.ProcessAll; +import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.process.esinspectdelayapply.entity.ProcessEsInspectDelayApply; import com.jero.modules.activiti.process.esinspectdelayapply.service.IProcessEsInspectDelayApplyService; import com.jero.modules.activiti.service.WorkCenterService; @@ -33,4 +34,9 @@ public class EsInspectDelayApplyFlow implements WorkCenterService { new LambdaQueryWrapper() .eq(ProcessEsInspectDelayApply::getProjectId, processAll.getProjectId())); } + + @Override + public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { + + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlow.java index 659914b0..82b240a3 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlow.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlow.java @@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.esinspectplan.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.activiti.entity.ProcessAll; +import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlan; import com.jero.modules.activiti.process.esinspectplan.service.IProcessEsInspectPlanService; import com.jero.modules.activiti.service.WorkCenterService; @@ -33,4 +34,9 @@ public class EsInspectPlanFlow implements WorkCenterService { new LambdaQueryWrapper() .eq(ProcessEsInspectPlan::getProjectId, processAll.getProjectId())); } + + @Override + public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { + + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlow.java index 6aaaaf47..199a27bf 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlow.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlow.java @@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.esinspectrectify.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.activiti.entity.ProcessAll; +import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.process.esinspectrectify.entity.ProcessEsInspectRectify; import com.jero.modules.activiti.process.esinspectrectify.service.IProcessEsInspectRectifyService; import com.jero.modules.activiti.service.WorkCenterService; @@ -35,4 +36,9 @@ public class EsInspectRectifyFlow implements WorkCenterService { .eq(ProcessEsInspectRectify::getProjectId, processAll.getProjectId())); } + + @Override + public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { + + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlow.java index 906b1569..b170b783 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlow.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlow.java @@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.espermissionapply.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.activiti.entity.ProcessAll; +import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermissionApply; import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService; import com.jero.modules.activiti.service.WorkCenterService; @@ -33,4 +34,9 @@ public class EsPermissionApplyFlow implements WorkCenterService { new LambdaQueryWrapper() .eq(ProcessEsPermissionApply::getProjectId, processAll.getProjectId())); } + + @Override + public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { + + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java index 096d064c..24e32557 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java @@ -12,6 +12,7 @@ import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.util.UUIDUtils; import com.jero.modules.activiti.entity.ProcessAll; +import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.enums.ProcessStatusEnum; import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.process.common.entity.ProcessDraft; @@ -628,6 +629,11 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl() .eq(ProcessFbConsultationUserLink::getBusinessId, processAll.getProjectId())); } + + @Override + public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { + + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java index 669ac00e..4a9bd192 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java @@ -10,6 +10,7 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.UUIDUtils; import com.jero.modules.activiti.entity.ProcessAll; +import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.process.common.entity.CommonVO; import com.jero.modules.activiti.process.common.entity.CounterSignNodeNameConstants; @@ -332,4 +333,9 @@ public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl() .eq(ProcessFbStandardPurchase::getBusinessId, processAll.getProjectId())); } + + @Override + public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { + + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java index d39a0f79..6d5e6dd6 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java @@ -10,6 +10,7 @@ import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.entity.ProcessNode; import com.jero.modules.activiti.entity.ProcessNodeLink; import com.jero.modules.activiti.enums.CommitFlagEnum; +import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.process.common.common.DraftCommon; import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.jero.modules.activiti.process.common.service.ProcessDraftService; @@ -20,10 +21,7 @@ import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO; import com.jero.modules.activiti.process.fb.dto.ProcessDTO; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; -import com.jero.modules.activiti.service.ProcessAllService; -import com.jero.modules.activiti.service.ProcessApprovalRecordService; -import com.jero.modules.activiti.service.ProcessNodeLinkService; -import com.jero.modules.activiti.service.ProcessNodeService; +import com.jero.modules.activiti.service.*; import com.jero.modules.laws.common.util.CurrentUserUtil; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.HistoryService; @@ -263,7 +261,9 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { public void transfer(String taskId, String toUserId) { isMyTask(taskId); // 判断是否拥有任务处理权限 ProcessApprovalRecord processApprovalRecord = processApprovalRecordService.getToDoByTaskId(taskId); - + String processInstanceId = processApprovalRecord.getProcessInstanceId(); + ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); + Integer prcType = processAll.getPrcType(); // 删除自己的草稿 deleteMyDraft(taskId, processApprovalRecord.getProjectId(), null); @@ -271,6 +271,17 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { processApprovalRecord.setUserId(toUserId); // 任务处理人 processApprovalRecordService.updateById(processApprovalRecord); taskService.setAssignee(taskId, toUserId); + WorkCenterService classByValue = null; + try { + Object o = Class.forName(ProcessTypeEnum.getClassByValue(prcType)).newInstance(); + if (o instanceof WorkCenterService){ + classByValue = (WorkCenterService) o; + classByValue.handleTransfer(processAll,processApprovalRecord, toUserId); + } + }catch (Exception e) { + log.error(e.getMessage(),e); + throw new JeroBootException(e.getMessage()); + } } /** diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlow.java index 341fd522..408bf938 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlow.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlow.java @@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.meetingmanage.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.activiti.entity.ProcessAll; +import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManage; import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManagePersonnel; import com.jero.modules.activiti.process.meetingmanage.service.IProcessMeetingManagePersonnelService; @@ -48,4 +49,9 @@ public class MeetingManageFlow implements WorkCenterService { new LambdaQueryWrapper() .in(ProcessMeetingManagePersonnel::getProcessMeetingManageId, idList)); } + + @Override + public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { + + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/WorkCenterService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/WorkCenterService.java index 80426be2..c3a659e7 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/WorkCenterService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/WorkCenterService.java @@ -1,6 +1,7 @@ package com.jero.modules.activiti.service; import com.jero.modules.activiti.entity.ProcessAll; +import com.jero.modules.activiti.entity.ProcessApprovalRecord; /** * @author liJiaRao @@ -12,4 +13,12 @@ public interface WorkCenterService { * @param processAll 流程总表 */ void changeToDraft(ProcessAll processAll); + + /** + * 处理转办 + * @param processAll + * @param processApprovalRecord + * @param toUserId + */ + void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId); }