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); }