From be1b9d0421bb9fe9ef2c158e0d104624bbb36bc7 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 11 Jul 2025 16:11:58 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20EOA=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=97=B6=E6=94=AF=E6=8C=81=E6=9F=A5=E7=9C=8B=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E5=86=85=E5=AE=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1463084353290240]EOA审批时支持查看指定步骤内容优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1463084353290240 --- .../processtask/ProcessTaskStepListApi.java | 105 +++++++++--------- .../process/service/ProcessTaskService.java | 6 + .../service/ProcessTaskServiceImpl.java | 48 ++++++++ 3 files changed, 107 insertions(+), 52 deletions(-) diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java index f4b2f49f1..d335e79fb 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java @@ -1,16 +1,17 @@ package neatlogic.module.process.api.processtask; import com.alibaba.fastjson.JSONObject; -import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.common.constvalue.systemuser.SystemUser; import neatlogic.framework.exception.type.PermissionDeniedException; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.constvalue.*; -import neatlogic.framework.process.dto.*; +import neatlogic.framework.process.constvalue.ProcessStepType; +import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepStatus; +import neatlogic.framework.process.dto.ProcessTaskStepVo; +import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException; -import neatlogic.framework.process.exception.process.ProcessStepHandlerNotFoundException; import neatlogic.framework.process.exception.process.ProcessStepUtilHandlerNotFoundException; import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; @@ -108,7 +109,7 @@ public class ProcessTaskStepListApi extends PrivateApiComponentBase { if (CollectionUtils.isNotEmpty(processTaskStepOperateSet) && processTaskStepOperateSet.contains(ProcessTaskStepOperationType.STEP_VIEW)) { processTaskStepVo.setIsView(1); if (!Objects.equals(processTaskStepVo.getId(), startProcessTaskStepVo.getId())) { - getProcessTaskStepDetail(processTaskStepVo); + processTaskService.getProcessTaskStepDetail(processTaskStepVo); } } else { processTaskStepVo.setIsView(0); @@ -153,50 +154,50 @@ public class ProcessTaskStepListApi extends PrivateApiComponentBase { return startProcessTaskStepVo; } - private void getProcessTaskStepDetail(ProcessTaskStepVo processTaskStepVo) { - // 处理人列表 - processTaskService.setProcessTaskStepUser(processTaskStepVo); - - /** 当前步骤特有步骤信息 **/ - IProcessStepInternalHandler processStepUtilHandler = - ProcessStepInternalHandlerFactory.getHandler(processTaskStepVo.getHandler()); - if (processStepUtilHandler == null) { - throw new ProcessStepHandlerNotFoundException(processTaskStepVo.getHandler()); - } - processTaskStepVo.setHandlerStepInfo(processStepUtilHandler.getNonStartStepInfo(processTaskStepVo)); - // 步骤评论列表 - List typeList = new ArrayList<>(); - typeList.add(ProcessTaskStepOperationType.STEP_COMMENT.getValue()); - typeList.add(ProcessTaskStepOperationType.STEP_COMPLETE.getValue()); - typeList.add(ProcessTaskStepOperationType.STEP_BACK.getValue()); - typeList.add(ProcessTaskOperationType.PROCESSTASK_RETREAT.getValue()); - typeList.add(ProcessTaskOperationType.PROCESSTASK_TRANSFER.getValue()); - typeList.add(ProcessTaskStepOperationType.STEP_REAPPROVAL.getValue()); - typeList.add(ProcessTaskOperationType.PROCESSTASK_START.getValue()); - typeList.add(ProcessTaskStepOperationType.STEP_TRANSFER.getValue()); - processTaskStepVo.setCommentList( - processTaskService.getProcessTaskStepReplyListByProcessTaskStepId(processTaskStepVo.getId(), typeList)); - processTaskStepVo.setActionList(processTaskService.getProcessTaskActionListByProcessTaskStepId(processTaskStepVo.getId())); - //任务列表 - processTaskStepTaskService.getProcessTaskStepTask(processTaskStepVo); - List taskConfigList = processTaskStepTaskService.getTaskConfigList(processTaskStepVo); - processTaskStepVo.setTaskConfigList(taskConfigList); - // 时效列表 - processTaskStepVo.setSlaTimeList(processTaskService.getSlaTimeListByProcessTaskStepId(processTaskStepVo.getId())); - // automatic processtaskStepData - ProcessTaskStepDataVo stepDataVo = processTaskStepDataMapper - .getProcessTaskStepData(new ProcessTaskStepDataVo(processTaskStepVo.getProcessTaskId(), - processTaskStepVo.getId(), processTaskStepVo.getHandler(), SystemUser.SYSTEM.getUserUuid())); - if (stepDataVo != null) { - JSONObject stepDataJson = stepDataVo.getData(); - stepDataJson.put("isStepUser", - processTaskMapper - .checkIsProcessTaskStepUser(new ProcessTaskStepUserVo(processTaskStepVo.getProcessTaskId(), - processTaskStepVo.getId(), UserContext.get().getUserUuid())) > 0 ? 1 : 0); - processTaskStepVo.setProcessTaskStepData(stepDataJson); - } - processTaskStepVo.setReplaceableTextList(processTaskService.getReplaceableTextList(processTaskStepVo)); - processTaskStepVo.setCustomStatusList(processTaskService.getCustomStatusList(processTaskStepVo)); - processTaskStepVo.setCustomButtonList(processTaskService.getCustomButtonList(processTaskStepVo)); - } +// private void getProcessTaskStepDetail(ProcessTaskStepVo processTaskStepVo) { +// // 处理人列表 +// processTaskService.setProcessTaskStepUser(processTaskStepVo); +// +// /** 当前步骤特有步骤信息 **/ +// IProcessStepInternalHandler processStepUtilHandler = +// ProcessStepInternalHandlerFactory.getHandler(processTaskStepVo.getHandler()); +// if (processStepUtilHandler == null) { +// throw new ProcessStepHandlerNotFoundException(processTaskStepVo.getHandler()); +// } +// processTaskStepVo.setHandlerStepInfo(processStepUtilHandler.getNonStartStepInfo(processTaskStepVo)); +// // 步骤评论列表 +// List typeList = new ArrayList<>(); +// typeList.add(ProcessTaskStepOperationType.STEP_COMMENT.getValue()); +// typeList.add(ProcessTaskStepOperationType.STEP_COMPLETE.getValue()); +// typeList.add(ProcessTaskStepOperationType.STEP_BACK.getValue()); +// typeList.add(ProcessTaskOperationType.PROCESSTASK_RETREAT.getValue()); +// typeList.add(ProcessTaskOperationType.PROCESSTASK_TRANSFER.getValue()); +// typeList.add(ProcessTaskStepOperationType.STEP_REAPPROVAL.getValue()); +// typeList.add(ProcessTaskOperationType.PROCESSTASK_START.getValue()); +// typeList.add(ProcessTaskStepOperationType.STEP_TRANSFER.getValue()); +// processTaskStepVo.setCommentList( +// processTaskService.getProcessTaskStepReplyListByProcessTaskStepId(processTaskStepVo.getId(), typeList)); +// processTaskStepVo.setActionList(processTaskService.getProcessTaskActionListByProcessTaskStepId(processTaskStepVo.getId())); +// //任务列表 +// processTaskStepTaskService.getProcessTaskStepTask(processTaskStepVo); +// List taskConfigList = processTaskStepTaskService.getTaskConfigList(processTaskStepVo); +// processTaskStepVo.setTaskConfigList(taskConfigList); +// // 时效列表 +// processTaskStepVo.setSlaTimeList(processTaskService.getSlaTimeListByProcessTaskStepId(processTaskStepVo.getId())); +// // automatic processtaskStepData +// ProcessTaskStepDataVo stepDataVo = processTaskStepDataMapper +// .getProcessTaskStepData(new ProcessTaskStepDataVo(processTaskStepVo.getProcessTaskId(), +// processTaskStepVo.getId(), processTaskStepVo.getHandler(), SystemUser.SYSTEM.getUserUuid())); +// if (stepDataVo != null) { +// JSONObject stepDataJson = stepDataVo.getData(); +// stepDataJson.put("isStepUser", +// processTaskMapper +// .checkIsProcessTaskStepUser(new ProcessTaskStepUserVo(processTaskStepVo.getProcessTaskId(), +// processTaskStepVo.getId(), UserContext.get().getUserUuid())) > 0 ? 1 : 0); +// processTaskStepVo.setProcessTaskStepData(stepDataJson); +// } +// processTaskStepVo.setReplaceableTextList(processTaskService.getReplaceableTextList(processTaskStepVo)); +// processTaskStepVo.setCustomStatusList(processTaskService.getCustomStatusList(processTaskStepVo)); +// processTaskStepVo.setCustomButtonList(processTaskService.getCustomButtonList(processTaskStepVo)); +// } } diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskService.java b/src/main/java/neatlogic/module/process/service/ProcessTaskService.java index 8d89031a7..66f5d64ba 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskService.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskService.java @@ -549,4 +549,10 @@ public interface ProcessTaskService { List relationProcessTaskIdList, String source ); + + /** + * 获取步骤列表中步骤信息 + * @param processTaskStepVo + */ + void getProcessTaskStepDetail(ProcessTaskStepVo processTaskStepVo); } diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java index 4c8260152..a654a7e58 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java @@ -3362,4 +3362,52 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC processTaskStepVo.getParamObj().put("source", source); processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.RELATION); } + + @Override + public void getProcessTaskStepDetail(ProcessTaskStepVo processTaskStepVo) { + // 处理人列表 + setProcessTaskStepUser(processTaskStepVo); + + /** 当前步骤特有步骤信息 **/ + IProcessStepInternalHandler processStepUtilHandler = + ProcessStepInternalHandlerFactory.getHandler(processTaskStepVo.getHandler()); + if (processStepUtilHandler == null) { + throw new ProcessStepHandlerNotFoundException(processTaskStepVo.getHandler()); + } + processTaskStepVo.setHandlerStepInfo(processStepUtilHandler.getNonStartStepInfo(processTaskStepVo)); + // 步骤评论列表 + List typeList = new ArrayList<>(); + typeList.add(ProcessTaskStepOperationType.STEP_COMMENT.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_COMPLETE.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_BACK.getValue()); + typeList.add(ProcessTaskOperationType.PROCESSTASK_RETREAT.getValue()); + typeList.add(ProcessTaskOperationType.PROCESSTASK_TRANSFER.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_REAPPROVAL.getValue()); + typeList.add(ProcessTaskOperationType.PROCESSTASK_START.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_TRANSFER.getValue()); + processTaskStepVo.setCommentList( + getProcessTaskStepReplyListByProcessTaskStepId(processTaskStepVo.getId(), typeList)); + processTaskStepVo.setActionList(getProcessTaskActionListByProcessTaskStepId(processTaskStepVo.getId())); + //任务列表 + processTaskStepTaskService.getProcessTaskStepTask(processTaskStepVo); + List taskConfigList = processTaskStepTaskService.getTaskConfigList(processTaskStepVo); + processTaskStepVo.setTaskConfigList(taskConfigList); + // 时效列表 + processTaskStepVo.setSlaTimeList(getSlaTimeListByProcessTaskStepId(processTaskStepVo.getId())); + // automatic processtaskStepData + ProcessTaskStepDataVo stepDataVo = processTaskStepDataMapper + .getProcessTaskStepData(new ProcessTaskStepDataVo(processTaskStepVo.getProcessTaskId(), + processTaskStepVo.getId(), processTaskStepVo.getHandler(), SystemUser.SYSTEM.getUserUuid())); + if (stepDataVo != null) { + JSONObject stepDataJson = stepDataVo.getData(); + stepDataJson.put("isStepUser", + processTaskMapper + .checkIsProcessTaskStepUser(new ProcessTaskStepUserVo(processTaskStepVo.getProcessTaskId(), + processTaskStepVo.getId(), UserContext.get().getUserUuid())) > 0 ? 1 : 0); + processTaskStepVo.setProcessTaskStepData(stepDataJson); + } + processTaskStepVo.setReplaceableTextList(getReplaceableTextList(processTaskStepVo)); + processTaskStepVo.setCustomStatusList(getCustomStatusList(processTaskStepVo)); + processTaskStepVo.setCustomButtonList(getCustomButtonList(processTaskStepVo)); + } } -- Gitee