diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java index e48bac6d..374f2c2c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java @@ -38,11 +38,12 @@ public class ProcessFbEntryChangeController extends JeroController> queryProcessInfoVO(String draftId, String processInstanceId){ - ProcessInfoVO processInfoVO = processFbEntryChangeService.queryProcessInfoVO(draftId, processInstanceId); + public Result> queryProcessInfoVO(String draftId, String processInstanceId, String taskId){ + ProcessInfoVO processInfoVO = processFbEntryChangeService.queryProcessInfoVO(draftId, processInstanceId, taskId); return Result.OK(processInfoVO); } 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 f39be563..30cb16db 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 @@ -39,11 +39,12 @@ public class ProcessFbStandardPurchaseController extends JeroController>> queryProcessInfoVO(String draftId, String processInstanceId){ - ProcessInfoVO> processInfoVO = processFbStandardPurchaseService.queryProcessInfoVO(draftId, processInstanceId); + public Result>> queryProcessInfoVO(String draftId, String processInstanceId, String taskId){ + ProcessInfoVO> processInfoVO = processFbStandardPurchaseService.queryProcessInfoVO(draftId, processInstanceId, taskId); return Result.OK(processInfoVO); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbEntryChangeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbEntryChangeService.java index 7060cb0c..5130363a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbEntryChangeService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbEntryChangeService.java @@ -58,5 +58,5 @@ public interface IProcessFbEntryChangeService extends IService queryProcessInfoVO(String draftId, String processInstanceId); + ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId, String taskId); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardPurchaseService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardPurchaseService.java index ba3317b2..7a9dcc73 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardPurchaseService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardPurchaseService.java @@ -20,7 +20,7 @@ public interface IProcessFbStandardPurchaseService extends IService> queryProcessInfoVO(String draftId, String processInstanceId); + ProcessInfoVO> queryProcessInfoVO(String draftId, String processInstanceId, String taskId); /** * @Author: liao diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java index 2140c125..8e48b825 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java @@ -95,7 +95,7 @@ public interface IProcessHandleService { * @Date: 2023/11/8 11:16 * @Description: 查询流程信息 **/ - ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId); + ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId, String taskId); /** * @Author: liao 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 66a4723e..c6fc632c 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 @@ -217,8 +217,8 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl queryProcessInfoVO(String draftId, String processInstanceId) { - ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId); + public ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId, String taskId) { + ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId, taskId); ProcessFbEntryChange processFbEntryChange = getById(processInfoVO.getBusinessId()); Map map = JSON.parseObject(processFbEntryChange.getBusinessJson(), Map.class); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java index d2437ae8..e2d4932f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java @@ -264,12 +264,18 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl queryProcessInfoVO(String draftId, String processInstanceId, String taskId) { - ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId); + ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId, taskId); ProcessFbStandardConsultationVO processFbStandardConsultationVO = new ProcessFbStandardConsultationVO(); - ProcessFbStandardConsultation processFbStandardConsultation = getById(processInfoVO.getBusinessId()); + String businessId = processInfoVO.getBusinessId(); + ProcessFbStandardConsultation processFbStandardConsultation = getById(businessId); processFbStandardConsultationVO.setProcessFbStandardConsultation(processFbStandardConsultation); // 业务基本信息 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ProcessFbConsultationList::getBusinessId, businessId); + List consultationLists = processFbConsultationListService.list(queryWrapper); + processFbStandardConsultationVO.setProcessFbConsultationLists(consultationLists); + processInfoVO.setBusinessInfoDTO(processFbStandardConsultationVO); return processInfoVO; } 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 6bbe12bc..06c02c38 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 @@ -54,8 +54,8 @@ public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl> queryProcessInfoVO(String draftId, String processInstanceId) { - ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId); + public ProcessInfoVO> queryProcessInfoVO(String draftId, String processInstanceId, String taskId) { + ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId, taskId); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ProcessFbStandardPurchase::getBusinessId, processInfoVO.getBusinessId()); 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 0a79a6f7..a0b5e5ef 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 @@ -331,7 +331,14 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { * @Description: 查询流程信息 **/ @Override - public ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId) { + public ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId, String taskId) { + if (StringUtils.isBlank(draftId) && StringUtils.isBlank(taskId)) { + throw new JeroBootException(ResultCommon.NO_PERMISSION); + } + if (StringUtils.isNotBlank(taskId)) { + isMyTask(taskId); + } + ProcessInfoVO processInfoVO = new ProcessInfoVO(); // 流程信息 BasicProcessInfoDTO basicProcessInfoDTO = new BasicProcessInfoDTO(); @@ -356,6 +363,9 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { // 审批信息 if (StringUtils.isNotBlank(draftId)) { ProcessDraft processDraft = processDraftService.getById(draftId); + if (!CurrentUserUtil.getId().equals(processDraft.getUserId())) { + throw new JeroBootException(ResultCommon.NO_PERMISSION); + } if (!Objects.isNull(processDraft)) { basicTaskInfoDTO.setTaskId(processDraft.getTaskId()); basicTaskInfoDTO.setHandleText(processDraft.getHandleText());