Commit cac31caf authored by Tong Li's avatar Tong Li

Merge remote-tracking branch 'origin/tl'

parents dce9abd3 657b7b90
......@@ -932,7 +932,7 @@ private GlobalParam InitGlobalParam()
// 按照优先级排序
orders.sort(
Comparator.comparing(Order::getActualPriority).reversed()
Comparator.comparing(Order::getActualPriority)
);
return orders;
......@@ -1043,7 +1043,7 @@ private GlobalParam InitGlobalParam()
OrderSortRule.SortCondition condition3 = new OrderSortRule.SortCondition();
condition3.setSequence(1);
condition3.setFieldName("priority");
condition3.setReverse(true); // 高优先级在前
condition3.setReverse(false); // 优先级越小越越先
conditions.add(condition3);
}
......@@ -1051,7 +1051,7 @@ private GlobalParam InitGlobalParam()
OrderSortRule.SortCondition condition3 = new OrderSortRule.SortCondition();
condition3.setSequence(1);
condition3.setFieldName("priority");
condition3.setReverse(true); // 高优先级在前
condition3.setReverse(false); // 优先级越小越越先
conditions.add(condition3);
}
......
......@@ -36,7 +36,9 @@ public class PlanResultServiceTest {
// NSGAIIUtils nsgaiiUtils=new NSGAIIUtils();
// nsgaiiUtils.Test();
planResultService.execute2("31EC5BAF7F6B41DFB79AB031D81C53C0");
// planResultService.execute2("31EC5BAF7F6B41DFB79AB031D81C53C0");
planResultService.execute2("4072BCD6A43B468F96489211AD041A26");
// LocalDateTime t= LocalDateTime.of(2025, 11, 15, 6, 51, 11);
// List<Integer> opids=new ArrayList<>();
// opids.add(1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment