From 9c7cc28aed00e8209e74fe463b1d146613fb1ac3 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 15 Jan 2025 11:06:27 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=87=BA=E5=8E=82=E8=87=AA=E5=B8=A6=E7=9A=84?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=94=AF=E6=8C=81=E5=9C=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1334617888489472]工单中心出厂自带的分类支持在数据库修改查询的时间范围 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1334617888489472 --- .../api/processtask/ProcessTaskFormApi.java | 1 - .../mapper/workcenter/WorkcenterMapper.xml | 3 ++- .../service/ProcessTaskServiceImpl.java | 15 --------------- .../ProcessTaskStepTaskServiceImpl.java | 19 ++++++++++--------- .../ConditionProcessUtilHandler.java | 9 +++++++++ .../utilhandler/EndProcessUtilHandler.java | 14 +------------- .../workcenter/init/WorkcenterInit.java | 12 ++++++++++++ 7 files changed, 34 insertions(+), 39 deletions(-) diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFormApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFormApi.java index d7d71ca15..b642d0afd 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFormApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFormApi.java @@ -90,7 +90,6 @@ public class ProcessTaskFormApi extends PrivateApiComponentBase { resultObj.put("formAttributeDataMap", processTaskVo.getFormAttributeDataMap()); resultObj.put("formConfig", processTaskVo.getFormConfig()); - resultObj.put("formConfigAuthorityList", processTaskVo.getFormConfigAuthorityList()); resultObj.put("formAttributeHideList", processTaskVo.getFormAttributeHideList()); } diff --git a/src/main/java/neatlogic/module/process/dao/mapper/workcenter/WorkcenterMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/workcenter/WorkcenterMapper.xml index a7026d4a0..a28df7c3a 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/workcenter/WorkcenterMapper.xml +++ b/src/main/java/neatlogic/module/process/dao/mapper/workcenter/WorkcenterMapper.xml @@ -173,7 +173,8 @@ along with this program. If not, see .--> `sort`, `type`, `support`, - `is_show_total` + `is_show_total`, + `condition_config` from `process_workcenter` where `uuid` in diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java index bfff9d65a..c7041a762 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java @@ -287,10 +287,6 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC processTaskVo.getFormAttributeDataMap().put(processTaskFormAttributeDataVo.getAttributeUuid(), processTaskFormAttributeDataVo.getDataObj()); } processTaskVo.setProcessTaskFormAttributeDataList(processTaskFormAttributeDataList); - // 获取工单流程图信息 - String taskConfig = selectContentByHashMapper.getProcessTaskConfigStringByHash(processTaskVo.getConfigHash()); - JSONArray formConfigAuthorityList = (JSONArray) JSONPath.read(taskConfig, "process.formConfig.authorityList"); - processTaskVo.setFormConfigAuthorityList(formConfigAuthorityList); List formAttributeHideList = getFormConfigAuthorityConfig(processTaskVo); processTaskVo.setFormAttributeHideList(formAttributeHideList); } @@ -306,17 +302,6 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC throw new FormActiveVersionNotFoundExcepiton(formUuid); } processTaskVo.setFormConfig(formVersion.getFormConfig()); - JSONObject processConfig = processVo.getConfig(); - if (MapUtils.isNotEmpty(processConfig)) { - JSONObject process = processConfig.getJSONObject("process"); - if (MapUtils.isNotEmpty(process)) { - JSONObject formConfig = process.getJSONObject("formConfig"); - if (MapUtils.isNotEmpty(formConfig)) { - JSONArray authorityList = formConfig.getJSONArray("authorityList"); - processTaskVo.setFormConfigAuthorityList(authorityList); - } - } - } List formAttributeHideList = getFormConfigAuthorityConfig(processTaskVo); processTaskVo.setFormAttributeHideList(formAttributeHideList); } diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskStepTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskStepTaskServiceImpl.java index 854807614..5547c8fce 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskStepTaskServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskStepTaskServiceImpl.java @@ -15,6 +15,9 @@ along with this program. If not, see .*/ package neatlogic.module.process.service; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.common.constvalue.systemuser.SystemUser; import neatlogic.framework.dao.mapper.UserMapper; @@ -22,11 +25,7 @@ import neatlogic.framework.dto.UserVo; import neatlogic.framework.file.dao.mapper.FileMapper; import neatlogic.framework.file.dto.FileVo; import neatlogic.framework.process.constvalue.*; -import neatlogic.framework.process.operationauth.core.IOperationType; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepTaskMapper; -import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; -import neatlogic.module.process.dao.mapper.task.TaskMapper; +import neatlogic.framework.process.crossover.IProcessTaskStepTaskCrossoverService; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.operationauth.ProcessTaskHiddenException; import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException; @@ -35,13 +34,15 @@ import neatlogic.framework.process.exception.operationauth.ProcessTaskStepNotMin import neatlogic.framework.process.exception.process.ProcessStepUtilHandlerNotFoundException; import neatlogic.framework.process.exception.processtask.task.*; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepTaskNotifyTriggerType; +import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler; import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerFactory; import neatlogic.framework.process.task.TaskConfigManager; import neatlogic.framework.service.UserService; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepTaskMapper; +import neatlogic.module.process.dao.mapper.task.TaskMapper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; @@ -57,7 +58,7 @@ import java.util.stream.Collectors; * @since 2021/8/31 11:49 **/ @Service -public class ProcessTaskStepTaskServiceImpl implements ProcessTaskStepTaskService { +public class ProcessTaskStepTaskServiceImpl implements ProcessTaskStepTaskService, IProcessTaskStepTaskCrossoverService { @Resource ProcessTaskMapper processTaskMapper; @Resource diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/ConditionProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/ConditionProcessUtilHandler.java index 045bdc477..e7114507b 100755 --- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/ConditionProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/ConditionProcessUtilHandler.java @@ -1,5 +1,6 @@ package neatlogic.module.process.stephandler.utilhandler; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.process.constvalue.ProcessStepHandlerType; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerBase; @@ -31,6 +32,14 @@ public class ConditionProcessUtilHandler extends ProcessStepInternalHandlerBase } + @Override + public JSONObject makeupConfig(JSONObject configObj) { + if (configObj == null) { + configObj = new JSONObject(); + } + return configObj; + } + @Override public String[] getRegulateKeyList() { return new String[]{"moveonConfigList", "formTag"}; diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/EndProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/EndProcessUtilHandler.java index 5010176b6..484644a82 100644 --- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/EndProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/EndProcessUtilHandler.java @@ -2,9 +2,7 @@ package neatlogic.module.process.stephandler.utilhandler; import neatlogic.framework.notify.core.INotifyPolicyHandler; import neatlogic.framework.process.constvalue.ProcessStepHandlerType; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.dto.ProcessTaskStepVo; -import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerBase; import neatlogic.module.process.notify.handler.TaskNotifyPolicyHandler; import org.springframework.stereotype.Service; @@ -37,19 +35,9 @@ public class EndProcessUtilHandler extends ProcessStepInternalHandlerBase { return TaskNotifyPolicyHandler.class; } - @Override - public IOperationType[] getStepActions() { - /* 授权 */ - return new IOperationType[]{ - ProcessTaskOperationType.PROCESSTASK_ABORT, - ProcessTaskOperationType.PROCESSTASK_UPDATE, - ProcessTaskOperationType.PROCESSTASK_URGE - }; - } - @Override public String[] getRegulateKeyList() { - return new String[]{"processConfig", "formConfig", "scoreConfig", "slaList", "authorityList"}; + return new String[]{"processConfig", "formConfig", "scoreConfig", "slaList"}; } // @Override diff --git a/src/main/java/neatlogic/module/process/workcenter/init/WorkcenterInit.java b/src/main/java/neatlogic/module/process/workcenter/init/WorkcenterInit.java index 62c79d53a..8d72ef0e9 100644 --- a/src/main/java/neatlogic/module/process/workcenter/init/WorkcenterInit.java +++ b/src/main/java/neatlogic/module/process/workcenter/init/WorkcenterInit.java @@ -15,6 +15,7 @@ along with this program. If not, see .*/ package neatlogic.module.process.workcenter.init; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.common.constvalue.DeviceType; import neatlogic.framework.common.constvalue.GroupSearch; import neatlogic.framework.common.constvalue.UserType; @@ -26,6 +27,7 @@ import neatlogic.framework.process.workcenter.dto.WorkcenterVo; import neatlogic.framework.startup.StartupBase; import neatlogic.framework.tenantinit.ITenantInit; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; @@ -233,6 +235,16 @@ public class WorkcenterInit extends StartupBase implements ITenantInit { if (StringUtils.isNotBlank(oldWorkcenterVo.getSupport())) { workcenterVo.setSupport(oldWorkcenterVo.getSupport()); } + JSONObject oldConditionConfig = oldWorkcenterVo.getConditionConfig(); + if (MapUtils.isNotEmpty(oldConditionConfig)) { + JSONObject startTimeCondition = oldConditionConfig.getJSONObject("startTimeCondition"); + if (MapUtils.isNotEmpty(startTimeCondition)) { + JSONObject conditionConfig = workcenterVo.getConditionConfig(); + if (MapUtils.isNotEmpty(conditionConfig)) { + conditionConfig.put("startTimeCondition", startTimeCondition); + } + } + } } workcenterMapper.insertWorkcenter(workcenterVo); //初始化工单中心分类权限 -- Gitee