From d99b66d4efd799ee40ccba621605283ebfeed136 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 7 May 2024 14:32:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B0=86neatlogic-i?= =?UTF-8?q?tsm-base=E6=A8=A1=E5=9D=97=E4=B8=AD=E7=9A=84mapper=E6=8C=AA?= =?UTF-8?q?=E5=88=B0neatlogic-itsm=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1146889473327104]将neatlogic-itsm-base模块中的mapper挪到neatlogic-itsm模块 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1146889473327104 --- .../process/api/processtask/ProcessTaskCreateApi.java | 3 +++ .../process/dao/mapper/score/ScoreTemplateMapper.java | 4 ++-- .../module/process/service/ProcessTaskServiceImpl.java | 6 +++--- .../workerpolicy/handler/AssignWorkerPolicyHandler.java | 5 ++++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCreateApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCreateApi.java index b9ab19368..e5da19039 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCreateApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCreateApi.java @@ -1,7 +1,9 @@ package neatlogic.module.process.api.processtask; import com.alibaba.fastjson.JSONObject; +import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; +import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; @@ -10,6 +12,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; +@AuthAction(action = PROCESS_BASE.class) @Service @OperationType(type = OperationTypeEnum.UPDATE) public class ProcessTaskCreateApi extends PrivateApiComponentBase { diff --git a/src/main/java/neatlogic/module/process/dao/mapper/score/ScoreTemplateMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/score/ScoreTemplateMapper.java index c6fac17cf..291730d3f 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/score/ScoreTemplateMapper.java +++ b/src/main/java/neatlogic/module/process/dao/mapper/score/ScoreTemplateMapper.java @@ -18,7 +18,7 @@ package neatlogic.module.process.dao.mapper.score; import neatlogic.framework.common.dto.ValueTextVo; -import neatlogic.framework.process.crossover.IChannelTypeCrossoverMapper; +import neatlogic.framework.process.crossover.IScoreTemplateCrossoverMapper; import neatlogic.framework.process.dto.score.ProcessScoreTemplateVo; import neatlogic.framework.process.dto.score.ScoreTemplateDimensionVo; import neatlogic.framework.process.dto.score.ScoreTemplateVo; @@ -26,7 +26,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; -public interface ScoreTemplateMapper extends IChannelTypeCrossoverMapper { +public interface ScoreTemplateMapper extends IScoreTemplateCrossoverMapper { List searchScoreTemplate(ScoreTemplateVo scoreTemplateVo); diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java index 638f188b7..d273b3d87 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java @@ -640,9 +640,9 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC } } } - if (operatorProcessUserTypeList.contains(ProcessUserType.OWNER) && operatorProcessUserTypeList.contains(ProcessUserType.REPORTER)) { - operatorProcessUserTypeList.remove(ProcessUserType.REPORTER); - } +// if (operatorProcessUserTypeList.contains(ProcessUserType.OWNER) && operatorProcessUserTypeList.contains(ProcessUserType.REPORTER)) { +// operatorProcessUserTypeList.remove(ProcessUserType.REPORTER); +// } List operatorProcessUserTypeTextList = new ArrayList<>(operatorProcessUserTypeList.size()); for (ProcessUserType processUserType : operatorProcessUserTypeList) { operatorProcessUserTypeTextList.add(processUserType.getText()); diff --git a/src/main/java/neatlogic/module/process/workerpolicy/handler/AssignWorkerPolicyHandler.java b/src/main/java/neatlogic/module/process/workerpolicy/handler/AssignWorkerPolicyHandler.java index 566ee66fe..78c785f34 100644 --- a/src/main/java/neatlogic/module/process/workerpolicy/handler/AssignWorkerPolicyHandler.java +++ b/src/main/java/neatlogic/module/process/workerpolicy/handler/AssignWorkerPolicyHandler.java @@ -5,6 +5,7 @@ import java.util.List; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -66,7 +67,9 @@ public class AssignWorkerPolicyHandler implements IWorkerPolicyHandler { processTaskStepWorkerList.add(new ProcessTaskStepWorkerVo(processTaskId, processTaskStepId, GroupSearch.USER.getValue(), processTaskVo.getOwner(), ProcessUserType.MAJOR.getValue())); }else if(ProcessUserType.REPORTER.getValue().equals(split[1])) { ProcessTaskVo processTaskVo = processTaskMapper.getProcessTaskById(processTaskId); - processTaskStepWorkerList.add(new ProcessTaskStepWorkerVo(processTaskId, processTaskStepId, GroupSearch.USER.getValue(), processTaskVo.getReporter(), ProcessUserType.MAJOR.getValue())); + if (StringUtils.isNotBlank(processTaskVo.getReporter())) { + processTaskStepWorkerList.add(new ProcessTaskStepWorkerVo(processTaskId, processTaskStepId, GroupSearch.USER.getValue(), processTaskVo.getReporter(), ProcessUserType.MAJOR.getValue())); + } } }else if(GroupSearch.getValue(split[0]) != null) { processTaskStepWorkerList.add(new ProcessTaskStepWorkerVo(processTaskId, processTaskStepId, split[0], split[1], ProcessUserType.MAJOR.getValue())); -- Gitee From aa0a915bfa0a7360572d8335228298f57f6a7256 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 7 May 2024 14:34:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B0=86neatlogic-i?= =?UTF-8?q?tsm-base=E6=A8=A1=E5=9D=97=E4=B8=AD=E7=9A=84mapper=E6=8C=AA?= =?UTF-8?q?=E5=88=B0neatlogic-itsm=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1146889473327104]将neatlogic-itsm-base模块中的mapper挪到neatlogic-itsm模块 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1146889473327104 --- .../module/process/service/ProcessTaskServiceImpl.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java index d273b3d87..bb71680b6 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java @@ -640,9 +640,6 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC } } } -// if (operatorProcessUserTypeList.contains(ProcessUserType.OWNER) && operatorProcessUserTypeList.contains(ProcessUserType.REPORTER)) { -// operatorProcessUserTypeList.remove(ProcessUserType.REPORTER); -// } List operatorProcessUserTypeTextList = new ArrayList<>(operatorProcessUserTypeList.size()); for (ProcessUserType processUserType : operatorProcessUserTypeList) { operatorProcessUserTypeTextList.add(processUserType.getText()); -- Gitee