From e615ac076e66042a99df33e158694a1ed8049a56 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Sun, 4 Feb 2024 10:02:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2080183=20=E6=B3=95=E8=A7=84=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E6=B5=81=E7=A8=8B--=E5=8F=91=E8=B5=B7=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=8F=91=E8=B5=B7=E5=90=8E=E8=A2=AB=E9=A9=B3=E5=9B=9E?= =?UTF-8?q?--=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86=E5=92=8C=E6=9B=B4?= =?UTF-8?q?=E6=8D=A2=E4=BA=BA=E5=91=98--=E7=82=B9=E5=87=BB=E4=BF=9D?= =?UTF-8?q?=E5=AD=98--=E4=B8=8D=E8=B5=B7=E4=BD=9C=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProcessEsAnnualInitServiceImpl.java | 1 - .../ProcessFbStandardPurchaseController.java | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java index 60e262dd..1ec7fb64 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java @@ -309,7 +309,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl userMap = new HashMap<>(); -// boolean batchDelFlag = StrUtil.isNotBlank(annualInitData.getBatchRejectIds()); switch (taskName) { case STANDARD_ENGINEER_INIT: diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardPurchaseController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardPurchaseController.java index 2c5d63ea..96121794 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardPurchaseController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardPurchaseController.java @@ -2,7 +2,10 @@ package com.jero.modules.activiti.process.fb.controller; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.modules.activiti.enums.ProcessTypeEnum; +import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.jero.modules.activiti.process.common.entity.TransferVO; +import com.jero.modules.activiti.process.common.service.ActFlowCommonService; import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardPurchase; import com.jero.modules.activiti.process.fb.service.IProcessFbStandardPurchaseService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; @@ -18,6 +21,7 @@ import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; import org.springframework.web.servlet.ModelAndView; +import javax.annotation.Resource; import java.util.List; @@ -32,9 +36,13 @@ import java.util.List; @RequestMapping("/process/fb/processFbStandardPurchase") @Slf4j public class ProcessFbStandardPurchaseController extends JeroController { - @Autowired + + @Resource private IProcessFbStandardPurchaseService processFbStandardPurchaseService; + @Resource + private ActFlowCommonService actFlowCommonService; + @GetMapping("/queryProcessInfoVO") @AutoLog(value = "法规采购流程表-查询流程信息") @ApiImplicitParams({ @@ -43,7 +51,11 @@ public class ProcessFbStandardPurchaseController extends JeroController>> queryProcessInfoVO(String draftId, String processInstanceId, String taskId, String projectId) { + public Result queryProcessInfoVO(String draftId, String processInstanceId, String taskId, String projectId) { + ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.FB_STANDARD_PURCHASE); + if (draft != null) { + return Result.OK(draft); + } ProcessInfoVO> processInfoVO = processFbStandardPurchaseService.queryProcessInfoVO(draftId, processInstanceId, taskId, projectId); return Result.OK(processInfoVO); }