From 6479864c8501a2c1be1c6f9dd78653bffface89a Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Sat, 1 Jul 2023 11:15:29 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=9E=E4=BE=8B=EF=BC=8C=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=88=86=E7=B1=BB=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/dromara/workflow/domain/bo/ModelBo.java | 2 +- .../org/dromara/workflow/domain/bo/ProcessDefinitionBo.java | 6 ++++++ .../org/dromara/workflow/domain/bo/ProcessInstanceBo.java | 5 +++++ .../dromara/workflow/service/impl/ActModelServiceImpl.java | 4 ++++ .../service/impl/ActProcessDefinitionServiceImpl.java | 3 +++ .../service/impl/ActProcessInstanceServiceImpl.java | 6 ++++++ 6 files changed, 25 insertions(+), 1 deletion(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java index f8b037a65..40204a561 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java @@ -34,7 +34,7 @@ public class ModelBo extends PageEntity implements Serializable { private String key; /** - * 模型标识key + * 模型分类 */ @NotBlank(message = "模型分类不能为空", groups = {AddGroup.class}) private String categoryCode; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java index 0d7602284..86e9e0135 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java @@ -23,9 +23,15 @@ public class ProcessDefinitionBo extends PageEntity implements Serializable { * 流程定义名称key */ private String key; + /** * 流程定义名称 */ private String name; + /** + * 模型分类 + */ + private String categoryCode; + } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java index 0e404243f..2ab54dcd5 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java @@ -33,4 +33,9 @@ public class ProcessInstanceBo extends PageEntity implements Serializable { * 业务id */ private String businessKey; + + /** + * 模型分类 + */ + private String categoryCode; } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java index b9361cc3e..447472673 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java @@ -36,6 +36,7 @@ import org.flowable.engine.RepositoryService; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.Model; import org.flowable.engine.repository.ModelQuery; +import org.flowable.engine.repository.ProcessDefinition; import org.flowable.validation.ValidationError; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -292,6 +293,9 @@ public class ActModelServiceImpl implements IActModelService { // 更新 部署id 到流程定义模型数据表中 model.setDeploymentId(deployment.getId()); repositoryService.saveModel(model); + // 更新分类 + ProcessDefinition definition = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).singleResult(); + repositoryService.setProcessDefinitionCategory(definition.getId(), model.getCategory()); return true; } catch (Exception e) { e.printStackTrace(); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java index 7c7266b78..6691c9b16 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java @@ -64,6 +64,9 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer if (StringUtils.isNotEmpty(processDefinitionBo.getKey())) { query.processDefinitionKey(processDefinitionBo.getKey()); } + if (StringUtils.isNotEmpty(processDefinitionBo.getCategoryCode())) { + query.processDefinitionCategory(processDefinitionBo.getCategoryCode()); + } if (StringUtils.isNotEmpty(processDefinitionBo.getName())) { query.processDefinitionNameLike("%" + processDefinitionBo.getName() + "%"); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java index 9174370db..2ec1607e9 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java @@ -93,6 +93,9 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService if (StringUtils.isNotBlank(processInstanceBo.getBusinessKey())) { query.processInstanceBusinessKey(processInstanceBo.getBusinessKey()); } + if (StringUtils.isNotBlank(processInstanceBo.getCategoryCode())) { + query.processDefinitionCategory(processInstanceBo.getCategoryCode()); + } List processInstances = query.listPage(processInstanceBo.getPageNum(), processInstanceBo.getPageSize()); for (ProcessInstance processInstance : processInstances) { ProcessInstanceVo processInstanceVo = BeanUtil.toBean(processInstance, ProcessInstanceVo.class); @@ -124,6 +127,9 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService if (StringUtils.isNotBlank(processInstanceBo.getBusinessKey())) { query.processInstanceBusinessKey(processInstanceBo.getBusinessKey()); } + if (StringUtils.isNotBlank(processInstanceBo.getCategoryCode())) { + query.processDefinitionCategory(processInstanceBo.getCategoryCode()); + } List historicProcessInstances = query.listPage(processInstanceBo.getPageNum(), processInstanceBo.getPageSize()); for (HistoricProcessInstance historicProcessInstance : historicProcessInstances) { ProcessInstanceVo processInstanceVo = BeanUtil.toBean(historicProcessInstance, ProcessInstanceVo.class);