From 1d84a3c62eeee429f7d7d6339bcf9b504a9d7277 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 16 一月 2025 16:01:33 +0800
Subject: [PATCH] DNC流程配置、DNC部门处理
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/ActivitiDefinitionServiceImpl.java | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/ActivitiDefinitionServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/ActivitiDefinitionServiceImpl.java
index 14402bc..34bc76c 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/ActivitiDefinitionServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/ActivitiDefinitionServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.activiti.entity.ActivitiDefinition;
import org.jeecg.modules.activiti.mapper.ActivitiDefinitionMapper;
import org.jeecg.modules.activiti.request.ActivitiDefinitionRequest;
@@ -95,7 +96,7 @@
}
@Override
- public QueryPageResponseResult<ActivitiDefinition> findPageList(int page, int size, ActivitiDefinitionRequest request) {
+ public Result<?> findPageList(int page, int size, ActivitiDefinitionRequest request) {
if(page < 1 || size < 1) {
ExceptionCast.cast(CommonCode.INVALID_PAGE);
}
@@ -105,18 +106,10 @@
if(ValidateUtil.validateString(request.getActName())) {
lambdaQuery.like(ActivitiDefinition::getActName, request.getActName());
}
-
- if(ValidateUtil.validateString(request.getAscStr())) {
- String[] ascArr = request.getAscStr().split(",");
-// ((Page<ActivitiDefinition>) pageData).setAsc(ascArr);
- }
- if(ValidateUtil.validateString(request.getDescStr())) {
- String[] descStr = request.getDescStr().split(",");
-// ((Page<ActivitiDefinition>) pageData).setDesc(descStr);
- }
}
+ lambdaQuery.orderByDesc(ActivitiDefinition::getCreateTime);
IPage<ActivitiDefinition> definitionIPage = lambdaQuery.page(pageData);
- return new QueryPageResponseResult<>(CommonCode.SUCCESS, definitionIPage);
+ return Result.ok(definitionIPage);
}
--
Gitblit v1.9.3