DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(流程管理): 流程部署采用 ProcessUtils 工具类添加搜索条件

Browse Source
This commit is contained in:
konbai
2022-12-18 18:21:07 +08:00
parent 81648374f2
commit 662a1e2fcd
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfDeployServiceImpl.java
View File

@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.workflow.domain.WfDeployForm;
import com.ruoyi.flowable.core.domain.ProcessQuery; import com.ruoyi.flowable.core.domain.ProcessQuery;
import com.ruoyi.flowable.utils.ProcessUtils;
import com.ruoyi.workflow.domain.WfDeployForm;
import com.ruoyi.workflow.domain.vo.WfDeployVo; import com.ruoyi.workflow.domain.vo.WfDeployVo;
import com.ruoyi.workflow.mapper.WfDeployFormMapper; import com.ruoyi.workflow.mapper.WfDeployFormMapper;
import com.ruoyi.workflow.service.IWfDeployService; import com.ruoyi.workflow.service.IWfDeployService;
@@ -44,22 +44,8 @@ public class WfDeployServiceImpl implements IWfDeployService {
.latestVersion() .latestVersion()
.orderByProcessDefinitionKey() .orderByProcessDefinitionKey()
.asc(); .asc();
if (StringUtils.isNotBlank(processQuery.getProcessKey())) { // 构建搜索条件
processDefinitionQuery.processDefinitionKeyLike("%" + processQuery.getProcessKey() + "%"); ProcessUtils.buildProcessSearch(processDefinitionQuery, processQuery);
}
if (StringUtils.isNotBlank(processQuery.getProcessName())) {
processDefinitionQuery.processDefinitionNameLike("%" + processQuery.getProcessName() + "%");
}
if (StringUtils.isNotBlank(processQuery.getCategory())) {
processDefinitionQuery.processDefinitionCategory(processQuery.getCategory());
}
if (StringUtils.isNotBlank(processQuery.getState())) {
if (SuspensionState.ACTIVE.toString().equals(processQuery.getState())) {
processDefinitionQuery.active();
} else if (SuspensionState.SUSPENDED.toString().equals(processQuery.getState())) {
processDefinitionQuery.suspended();
}
}
long pageTotal = processDefinitionQuery.count(); long pageTotal = processDefinitionQuery.count();
if (pageTotal <= 0) { if (pageTotal <= 0) {
return TableDataInfo.build(); return TableDataInfo.build();