From 0b1f477e68dbcf0fff987cf0c9de287f0cd5cc0c Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 8 Aug 2024 15:20:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86=E6=9D=83=E9=99=90=E5=B9=B2?= =?UTF-8?q?=E9=A2=84=E5=BC=8F=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E6=B2=A1=E6=9C=89=E6=94=AF=E6=8C=81sla?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E8=81=94=E5=8A=A8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=BC=98=E5=85=88=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1218809673777152]后端-工单管理权限干预式修改表单的现在没有支持sla，以及联动修改工单优先级 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1218809673777152 --- .../processtask/UpdateProcessTaskFormApi.java | 44 +++++++++++++++++-- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/src/main/java/neatlogic/module/process/api/processtask/UpdateProcessTaskFormApi.java b/src/main/java/neatlogic/module/process/api/processtask/UpdateProcessTaskFormApi.java index 549f0888b..c705b3593 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/UpdateProcessTaskFormApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/UpdateProcessTaskFormApi.java @@ -26,9 +26,7 @@ import neatlogic.framework.fulltextindex.core.IFullTextIndexHandler; import neatlogic.framework.process.auth.PROCESSTASK_MODIFY; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; import neatlogic.framework.process.constvalue.ProcessTaskStepDataType; -import neatlogic.framework.process.dto.ProcessTaskStepDataVo; -import neatlogic.framework.process.dto.ProcessTaskStepVo; -import neatlogic.framework.process.dto.ProcessTaskVo; +import neatlogic.framework.process.dto.*; import neatlogic.framework.process.fulltextindex.ProcessFullTextIndexType; import neatlogic.framework.restful.annotation.Description; import neatlogic.framework.restful.annotation.Input; @@ -36,15 +34,19 @@ import neatlogic.framework.restful.annotation.OperationType; import neatlogic.framework.restful.annotation.Param; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.PriorityMapper; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper; import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.module.process.service.ProcessTaskService; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; +import java.util.Objects; @Service @Transactional @@ -52,6 +54,12 @@ import java.util.List; @AuthAction(action = PROCESSTASK_MODIFY.class) public class UpdateProcessTaskFormApi extends PrivateApiComponentBase { + @Resource + private ChannelMapper channelMapper; + + @Resource + private PriorityMapper priorityMapper; + @Resource private ProcessTaskMapper processTaskMapper; @@ -76,6 +84,7 @@ public class UpdateProcessTaskFormApi extends PrivateApiComponentBase { @Param(name = "formExtendAttributeDataList", type = ApiParamType.JSONARRAY, desc = "term.itsm.formextendattributedatalist"), @Param(name = "hidecomponentList", type = ApiParamType.JSONARRAY, desc = "term.itsm.hidecomponentlist"), @Param(name = "readcomponentList", type = ApiParamType.JSONARRAY, desc = "term.itsm.readcomponentlist"), + @Param(name = "priorityUuid", type = ApiParamType.STRING, desc = "common.priorityuuid"), }) @Description(desc = "nmpap.updateprocesstaskformapi.getname") @Override @@ -95,8 +104,35 @@ public class UpdateProcessTaskFormApi extends PrivateApiComponentBase { param.put("needVerifyIsRequired", false); param.put("source", paramObj.getString("source")); processStepHandlerUtil.saveForm(processTaskStepVo); - processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.UPDATEFORM); + // 更新优先级 + String priorityUuid = paramObj.getString("priorityUuid"); + if (StringUtils.isNotBlank(priorityUuid) && !Objects.equals(processTaskVo.getPriorityUuid(), priorityUuid)) { + PriorityVo priorityVo = priorityMapper.getPriorityByUuid(priorityUuid); + if (priorityVo != null) { + ChannelVo channel = channelMapper.getChannelByUuid(processTaskVo.getChannelUuid()); + if (channel != null) { + if (Objects.equals(channel.getIsActivePriority(), 1)) { + List channelPriorityList = channelMapper.getChannelPriorityListByChannelUuid(processTaskVo.getChannelUuid()); + for (ChannelPriorityVo channelPriority : channelPriorityList) { + if (Objects.equals(channelPriority.getPriorityUuid(), priorityUuid)) { + processTaskVo.setPriorityUuid(priorityUuid); + processTaskMapper.updateProcessTaskTitleOwnerPriorityUuid(processTaskVo); + break; + } + } + } + } else { + if (processTaskVo.getPriorityUuid() != null) { + processTaskVo.setPriorityUuid(priorityUuid); + processTaskMapper.updateProcessTaskTitleOwnerPriorityUuid(processTaskVo); + } + } + } + } + + processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.UPDATEFORM); + processStepHandlerUtil.calculateSla(new ProcessTaskVo(processTaskId), false); ProcessTaskStepDataVo processTaskStepDataVo = new ProcessTaskStepDataVo(); processTaskStepDataVo.setProcessTaskId(processTaskId); processTaskStepDataVo.setFcu(UserContext.get().getUserUuid(true)); -- Gitee From f61f5194d76c4c9e4a2048cd3ad65d57318d5364 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 8 Aug 2024 15:21:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86=E6=9D=83=E9=99=90=E5=B9=B2?= =?UTF-8?q?=E9=A2=84=E5=BC=8F=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E6=B2=A1=E6=9C=89=E6=94=AF=E6=8C=81sla?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E8=81=94=E5=8A=A8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=BC=98=E5=85=88=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1218809673777152]后端-工单管理权限干预式修改表单的现在没有支持sla，以及联动修改工单优先级 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1218809673777152 --- .../process/api/processtask/UpdateProcessTaskFormApi.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/neatlogic/module/process/api/processtask/UpdateProcessTaskFormApi.java b/src/main/java/neatlogic/module/process/api/processtask/UpdateProcessTaskFormApi.java index c705b3593..7cf4ab0b1 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/UpdateProcessTaskFormApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/UpdateProcessTaskFormApi.java @@ -130,9 +130,8 @@ public class UpdateProcessTaskFormApi extends PrivateApiComponentBase { } } } - - processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.UPDATEFORM); processStepHandlerUtil.calculateSla(new ProcessTaskVo(processTaskId), false); + processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.UPDATEFORM); ProcessTaskStepDataVo processTaskStepDataVo = new ProcessTaskStepDataVo(); processTaskStepDataVo.setProcessTaskId(processTaskId); processTaskStepDataVo.setFcu(UserContext.get().getUserUuid(true)); -- Gitee