From 04345d4eaec301c21331c4253b4da0f29b285349 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期六, 10 一月 2026 13:17:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index cb1ee8b..db3a663 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -193,10 +193,6 @@
.eq("in_enable", "Y")
.eq("status", 1);
- if (hasConfig) {
- wrapper.in("crn_no", allowedCrnNos);
- }
-
if (currentCircleTaskCrnNo != null) {
currentCircleTaskCrnNo = currentCircleTaskCrnNo + 1;
BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
@@ -281,12 +277,21 @@
enabledCrnps.sort(Comparator.comparingInt(o -> map.getOrDefault(o.getCrnNo(), 0)));
+ List<Integer> recommendList = new ArrayList<>();
+ List<Integer> baseRowList = new ArrayList<>();
for (BasCrnp basCrnp : enabledCrnps) {
List<List<Integer>> rowList = basCrnp.getControlRows$();
for (List<Integer> rows : rowList) {
- list.addAll(rows);
+ if(allowedCrnNos.contains(basCrnp.getCrnNo())) {
+ recommendList.addAll(rows);
+ }else {
+ baseRowList.addAll(rows);
+ }
}
}
+
+ list.addAll(recommendList);
+ list.addAll(baseRowList);
} catch (Exception e) {
e.printStackTrace();
}
@@ -317,10 +322,6 @@
Wrapper<BasDualCrnp> wrapper = new EntityWrapper<BasDualCrnp>()
.eq("in_enable", "Y")
.eq("status", 1);
-
- if (hasConfig) {
- wrapper.in("crn_no", allowedCrnNos);
- }
HashMap<Integer, Integer> map = new HashMap<>();
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<>());
@@ -385,12 +386,21 @@
enabledCrnps.sort(Comparator.comparingInt(o -> map.getOrDefault(o.getCrnNo(), 0)));
+ List<Integer> recommendList = new ArrayList<>();
+ List<Integer> baseRowList = new ArrayList<>();
for (BasDualCrnp basDualCrnp : enabledCrnps) {
List<List<Integer>> rowList = basDualCrnp.getControlRows$();
for (List<Integer> rows : rowList) {
- list.addAll(rows);
+ if(allowedCrnNos.contains(basDualCrnp.getCrnNo())) {
+ recommendList.addAll(rows);
+ }else {
+ baseRowList.addAll(rows);
+ }
}
}
+
+ list.addAll(recommendList);
+ list.addAll(baseRowList);
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.9.1