From 2acf081f3697ddedece3c882cc2745dd5969bbdb Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Tue, 28 Nov 2023 10:05:24 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5-=E4=B8=8A=E6=8A=A5=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E7=9A=84=E5=9C=BA=E6=99=AF=E5=88=A0=E4=BA=86=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E7=BB=84=E4=BB=B6=E6=9C=89=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC=EF=BC=8C=E6=8F=90=E4=BA=A4=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E6=97=B6=E4=BF=9D=E5=AD=98=E4=BA=86=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1033891366797312]工单上报-上报节点的场景删了部分组件，组件有默认值，提交工单时保存了默认值 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1033891366797312 --- .../processtask/ProcessTaskAuditListApi.java | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAuditListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAuditListApi.java index d73211775..cd3c46b30 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAuditListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAuditListApi.java @@ -1,37 +1,34 @@ package neatlogic.module.process.api.processtask; -import java.util.*; -import java.util.stream.Collectors; - +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; +import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.constvalue.SystemUser; import neatlogic.framework.dao.mapper.UserMapper; import neatlogic.framework.dto.UserVo; import neatlogic.framework.dto.WorkAssignmentUnitVo; -import neatlogic.framework.process.audithandler.core.ProcessTaskAuditDetailTypeFactory; -import neatlogic.framework.process.auth.PROCESS_BASE; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.alibaba.fastjson.JSONObject; - -import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.exception.type.PermissionDeniedException; import neatlogic.framework.process.audithandler.core.IProcessTaskStepAuditDetailHandler; +import neatlogic.framework.process.audithandler.core.ProcessTaskAuditDetailTypeFactory; import neatlogic.framework.process.audithandler.core.ProcessTaskStepAuditDetailHandlerFactory; +import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; import neatlogic.framework.process.dao.mapper.SelectContentByHashMapper; import neatlogic.framework.process.dto.ProcessTaskStepAuditDetailVo; import neatlogic.framework.process.dto.ProcessTaskStepAuditVo; -import neatlogic.framework.process.exception.processtask.ProcessTaskNoPermissionException; +import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; -import neatlogic.module.process.service.ProcessTaskService; -import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; +import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; +import neatlogic.module.process.service.ProcessTaskService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; +import java.util.stream.Collectors; @Service @AuthAction(action = PROCESS_BASE.class) @@ -89,11 +86,14 @@ public class ProcessTaskAuditListApi extends PrivateApiComponentBase { processTaskStepAuditVo.setProcessTaskStepId(processTaskStepId); List processTaskStepAuditList = processTaskMapper.getProcessTaskStepAuditList(processTaskStepAuditVo); Map> operateMap = new HashMap<>(); + Map processTaskStepMap = new HashMap<>(); List processtaskStepIdList = processTaskStepAuditList.stream().filter(e -> e.getProcessTaskStepId() != null).map(ProcessTaskStepAuditVo::getProcessTaskStepId).collect(Collectors.toList()); if(CollectionUtils.isNotEmpty(processtaskStepIdList)){ Long[] processTaskStepIds = new Long[processtaskStepIdList.size()]; processtaskStepIdList.toArray(processTaskStepIds); operateMap = new ProcessAuthManager.Builder().addProcessTaskStepId(processTaskStepIds).addOperationType(ProcessTaskOperationType.STEP_VIEW).build().getOperateMap(); + List processTaskStepList = processTaskMapper.getProcessTaskStepListByIdList(processtaskStepIdList); + processTaskStepMap = processTaskStepList.stream().collect(Collectors.toMap(e -> e.getId(), e -> e)); } for (ProcessTaskStepAuditVo processTaskStepAudit : processTaskStepAuditList) { if (processTaskStepAudit.getProcessTaskStepId() != null) { @@ -101,6 +101,10 @@ public class ProcessTaskAuditListApi extends PrivateApiComponentBase { if (!operateMap.computeIfAbsent(processTaskStepAudit.getProcessTaskStepId(), k -> new HashSet<>()).contains(ProcessTaskOperationType.STEP_VIEW)) { continue; } + ProcessTaskStepVo processTaskStepVo = processTaskStepMap.get(processTaskStepAudit.getProcessTaskStepId()); + if (processTaskStepVo != null) { + processTaskStepAudit.setFormSceneUuid(processTaskStepVo.getFormSceneUuid()); + } } if(StringUtils.isNotBlank(processTaskStepAudit.getDescriptionHash())){ -- Gitee