From 38483bade68f1de0197ba3c0b3848f2dd2dfa208 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Wed, 17 Jan 2024 13:48:08 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=BB=E5=8A=A1=E8=BD=AC=E4=BA=A4):=20?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/tasktransfer/entity/LawsProcessDB.java | 3 +++ .../mapper/xml/LawsTaskTransferMapper.xml | 1 + .../service/impl/LawsTaskTransferServiceImpl.java | 12 +++++++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/entity/LawsProcessDB.java b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/entity/LawsProcessDB.java index a998cb3c..8147d67c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/entity/LawsProcessDB.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/entity/LawsProcessDB.java @@ -26,6 +26,9 @@ public class LawsProcessDB { @Dict(dicCode = "prc_type") @ApiModelProperty(value="流程类型") private Integer prcType; + /**项目id*/ + @ApiModelProperty(value="项目id") + private String projectId; /**流程名称*/ @ApiModelProperty(value="流程名称") private String prcName; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml index dfe473af..49c40e0e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml @@ -89,6 +89,7 @@ task_id, prc_num, prc_type, + pa.project_id AS project_id, pa.prc_name, task_name, user_id AS user, diff --git a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java index c52b69c6..ed7890bb 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java @@ -8,6 +8,8 @@ import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.system.vo.LoginUser; import com.jero.modules.activiti.enums.FinishFlagEnum; import com.jero.modules.activiti.enums.ProcessStatusEnum; +import com.jero.modules.activiti.enums.ProcessTypeEnum; +import com.jero.modules.activiti.process.fb.service.IProcessFbStandardConsultationService; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.compare.entity.SarFileCompareInfo; import com.jero.modules.compare.service.ISarFileCompareInfoService; @@ -52,6 +54,7 @@ public class LawsTaskTransferServiceImpl implements ILawsTaskTransferService { private final ILawsCustomCompareInfoService lawsCustomCompareInfoService; private final ISysUserService sysUserService; private final IProcessHandleService processHandleService; + private final IProcessFbStandardConsultationService processFbStandardConsultationService; public LawsTaskTransferServiceImpl(LawsTaskTransferMapper lawsTaskTransferMapper, EnterpriseStandardPlanService enterpriseStandardPlanService, @@ -59,7 +62,8 @@ public class LawsTaskTransferServiceImpl implements ILawsTaskTransferService { ISarFileCompareInfoService sarFileCompareInfoService, ILawsCustomCompareInfoService lawsCustomCompareInfoService, ISysUserService sysUserService, - IProcessHandleService processHandleService) { + IProcessHandleService processHandleService, + IProcessFbStandardConsultationService processFbStandardConsultationService) { this.lawsTaskTransferMapper = lawsTaskTransferMapper; this.enterpriseStandardPlanService = enterpriseStandardPlanService; this.sarFileSplitInfoService = sarFileSplitInfoService; @@ -67,6 +71,7 @@ public class LawsTaskTransferServiceImpl implements ILawsTaskTransferService { this.lawsCustomCompareInfoService = lawsCustomCompareInfoService; this.sysUserService = sysUserService; this.processHandleService = processHandleService; + this.processFbStandardConsultationService = processFbStandardConsultationService; } @Override @@ -116,6 +121,11 @@ public class LawsTaskTransferServiceImpl implements ILawsTaskTransferService { for (LawsProcessDB lawsProcessDb : lawsProcessDBList) { String taskId = lawsProcessDb.getTaskId(); String toUserId = lawsProcessDb.getTransferUser(); + // 征求意见流程特殊处理 + if (ProcessTypeEnum.FB_STANDARD_CONSULTATION.getValue().equals(lawsProcessDb.getPrcType())) { + processFbStandardConsultationService.transfer(taskId, toUserId, lawsProcessDb.getProjectId()); + continue; + } processHandleService.transfer(taskId, toUserId); } }