Merge branch 'feature/swagger' into 'develop'

fix compare

See merge request o2oa/o2oa!724

o2server/x_component_assemble_control/src/main/java/com/x/component/assemble/control/jaxrs/status/ActionList.java

@@ -32,8 +32,9 @@ class ActionList extends BaseAction {
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 			Business business = new Business(emc);
 			List<String> ids = business.component().listVisiable();
-			emc.list(Component.class, ids).stream()
-					.sorted(Comparator.nullsLast(Comparator.comparing(Component::getOrderNumber))).forEach(o -> {
+			emc.list(Component.class, ids).stream().sorted(
+					Comparator.comparing(Component::getOrderNumber, Comparator.nullsLast(Comparator.naturalOrder())))
+					.forEach(o -> {
 						if (this.allow(o, effectivePerson.getDistinguishedName())) {
 							wo.getAllowList().add(WoComponent.copier.copy(o));
 						} else {

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionListCountWithApplication.java

@@ -42,7 +42,8 @@ class ActionListCountWithApplication extends BaseAction {
 			cq.multiselect(applicationPath, applicationNamePath, cb.count(root).as(Long.class)).where(p)
 					.groupBy(applicationPath, applicationNamePath);
 			List<Wo> wos = em.createQuery(cq).getResultList().stream()
-					.sorted(Comparator.nullsLast(Comparator.comparing(Wo::getName))).collect(Collectors.toList());
+					.sorted(Comparator.comparing(Wo::getName, Comparator.nullsLast(Comparator.naturalOrder())))
+					.collect(Collectors.toList());
 			result.setData(wos);
 			return result;
 		}

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionListCountWithProcess.java

@@ -50,7 +50,8 @@ class ActionListCountWithProcess extends BaseAction {
 			cq.multiselect(processPath, processNamePath, cb.count(root).as(Long.class)).where(p).groupBy(processPath,
 					processNamePath);
 			List<Wo> wos = em.createQuery(cq).getResultList().stream()
-					.sorted(Comparator.nullsLast(Comparator.comparing(Wo::getName))).collect(Collectors.toList());
+					.sorted(Comparator.comparing(Wo::getName, Comparator.nullsLast(Comparator.naturalOrder())))
+					.collect(Collectors.toList());
 			result.setData(wos);
 			return result;
 		}

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionManageGetAssignment.java

@@ -69,14 +69,7 @@ class ActionManageGetAssignment extends BaseAction {
 			try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 				emc.listEqual(Task.class, Task.work_FIELDNAME, id).stream()
 						.sorted(Comparator.comparing(Task::getStartTime, Comparator.nullsLast(Date::compareTo)))
-						.forEach(o -> {
-							try {
-								WoTask w = WoTask.copier.copy(o);
-								wo.getTaskList().add(w);
-							} catch (Exception e) {
-								LOGGER.error(e);
-							}
-						});
+						.map(WoTask.copier::copy).forEach(wo.getTaskList()::add);
 			} catch (Exception e) {
 				LOGGER.error(e);
 			}

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/BaseCreateAction.java

@@ -7,10 +7,10 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.gson.JsonElement;
+import com.mchange.lang.ObjectUtils;
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.JpaObject;
@@ -22,8 +22,6 @@ import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.http.TokenType;
 import com.x.base.core.project.jaxrs.WoId;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
 import com.x.base.core.project.organization.Unit;
 import com.x.base.core.project.tools.ListTools;
 import com.x.organization.core.express.Organization;
@@ -34,7 +32,6 @@ import com.x.processplatform.core.entity.content.Task;
 import com.x.processplatform.core.entity.content.TaskCompleted;
 import com.x.processplatform.core.entity.content.Work;
 import com.x.processplatform.core.entity.content.WorkLog;
-import com.x.processplatform.core.express.assemble.surface.jaxrs.work.ActionCreateWi;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
@@ -249,7 +246,8 @@ class BaseCreateAction extends BaseAction {
 			this.referenceTaskCompleted(business, wo);
 			os.add(wo);
 		}
-		return os.stream().sorted(Comparator.nullsLast(Comparator.comparing(Wo::getArrivedTime)))
+		return os.stream()
+				.sorted(Comparator.comparing(Wo::getArrivedTime, Comparator.nullsLast(Comparator.naturalOrder())))
 				.collect(Collectors.toList());
 	}
 
@@ -274,7 +272,8 @@ class BaseCreateAction extends BaseAction {
 	private void referenceTask(Business business, Wo wo) throws Exception {
 		List<String> ids = business.task().listWithActivityToken(wo.getFromActivityToken());
 		List<WoTask> list = WoTask.copier.copy(business.entityManagerContainer().list(Task.class, ids));
-		wo.setTaskList(list.stream().sorted(Comparator.nullsLast(Comparator.comparing(WoTask::getStartTime)))
+		wo.setTaskList(list.stream()
+				.sorted(Comparator.comparing(WoTask::getStartTime, Comparator.nullsLast(Comparator.naturalOrder())))
 				.collect(Collectors.toList()));
 	}
 
@@ -282,10 +281,8 @@ class BaseCreateAction extends BaseAction {
 		List<String> ids = business.taskCompleted().listWithActivityToken(wo.getFromActivityToken());
 		List<WoTaskCompleted> list = WoTaskCompleted.copier
 				.copy(business.entityManagerContainer().list(TaskCompleted.class, ids));
-		Collections.sort(list, (o1, o2) -> ObjectUtils.compare(o1.getCompletedTime(), o2.getCompletedTime(), true));
-		wo.setTaskCompletedList(
-				list.stream().sorted(Comparator.nullsLast(Comparator.comparing(WoTaskCompleted::getCompletedTime)))
-						.collect(Collectors.toList()));
+		wo.setTaskCompletedList(list.stream().sorted(Comparator.comparing(WoTaskCompleted::getCompletedTime,
+				Comparator.nullsLast(Comparator.naturalOrder()))).collect(Collectors.toList()));
 	}
 
 }