提交 b81d9c6b 编写于 作者: O o2sword

根据应用获取可启动的流程排序按照先别名再按名称,与起草获取可启动流程接口返回一致

上级 d0263082
package com.x.processplatform.assemble.surface.jaxrs.process; package com.x.processplatform.assemble.surface.jaxrs.process;
import java.util.ArrayList;
import java.util.List;
import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.entity.JpaObject; import com.x.base.core.entity.JpaObject;
...@@ -14,13 +11,14 @@ import com.x.base.core.project.http.ActionResult; ...@@ -14,13 +11,14 @@ import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory; import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.tools.SortTools;
import com.x.processplatform.assemble.surface.Business; import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.core.entity.element.Application; import com.x.processplatform.core.entity.element.Application;
import com.x.processplatform.core.entity.element.Process; import com.x.processplatform.core.entity.element.Process;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import java.util.ArrayList;
import java.util.List;
class ActionListWithPersonWithApplication extends BaseAction { class ActionListWithPersonWithApplication extends BaseAction {
private static final Logger LOGGER = LoggerFactory.getLogger(ActionListWithPersonWithApplication.class); private static final Logger LOGGER = LoggerFactory.getLogger(ActionListWithPersonWithApplication.class);
...@@ -49,7 +47,7 @@ class ActionListWithPersonWithApplication extends BaseAction { ...@@ -49,7 +47,7 @@ class ActionListWithPersonWithApplication extends BaseAction {
for (String id : ids) { for (String id : ids) {
wos.add(Wo.copier.copy(business.process().pick(id))); wos.add(Wo.copier.copy(business.process().pick(id)));
} }
SortTools.asc(wos, false, "name"); wos = business.process().sort(wos);
result.setData(wos); result.setData(wos);
return result; return result;
} }
......
package com.x.processplatform.assemble.surface.jaxrs.process; package com.x.processplatform.assemble.surface.jaxrs.process;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import javax.persistence.EntityManager;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.container.factory.EntityManagerContainerFactory;
...@@ -27,14 +14,23 @@ import com.x.base.core.project.logger.Logger; ...@@ -27,14 +14,23 @@ import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory; import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.organization.OrganizationDefinition; import com.x.base.core.project.organization.OrganizationDefinition;
import com.x.base.core.project.tools.ListTools; import com.x.base.core.project.tools.ListTools;
import com.x.base.core.project.tools.SortTools;
import com.x.processplatform.assemble.surface.Business; import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.core.entity.element.Application; import com.x.processplatform.core.entity.element.Application;
import com.x.processplatform.core.entity.element.Process; import com.x.processplatform.core.entity.element.Process;
import com.x.processplatform.core.entity.element.Process_; import com.x.processplatform.core.entity.element.Process_;
import com.x.processplatform.core.express.service.processing.jaxrs.process.ActionListWithPersonWithApplicationFilterWi; import com.x.processplatform.core.express.service.processing.jaxrs.process.ActionListWithPersonWithApplicationFilterWi;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import javax.persistence.EntityManager;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
class ActionListWithPersonWithApplicationFilter extends BaseAction { class ActionListWithPersonWithApplicationFilter extends BaseAction {
...@@ -65,7 +61,7 @@ class ActionListWithPersonWithApplicationFilter extends BaseAction { ...@@ -65,7 +61,7 @@ class ActionListWithPersonWithApplicationFilter extends BaseAction {
for (String id : ids) { for (String id : ids) {
wos.add(Wo.copier.copy(business.process().pick(id))); wos.add(Wo.copier.copy(business.process().pick(id)));
} }
SortTools.asc(wos, false, "name"); wos = business.process().sort(wos);
result.setData(wos); result.setData(wos);
return result; return result;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册