From 035ecbe3a3540011f29a8f2287aead232749aaad Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期六, 19 四月 2025 10:38:25 +0800
Subject: [PATCH] qw
---
src/main/java/com/zy/asrs/controller/WorkController.java | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 3d98e4c..343dc04 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -69,13 +69,8 @@
public R availableTakeSite() {
Set<Map<String, Object>> result = new HashSet<>();
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
- // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- //RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
- wrapper.eq("type_no", 101);
- wrapper.orderBy("stn_no", true);
+ wrapper.eq("type_no", 101).orderBy("stn_no", true);
List<StaDesc> staDescs = staDescService.selectList(wrapper);
- // List<Integer> outSite = staDescs.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
-// List<Integer> outSite = basDevpService.getAvailableOutSite(101);
for (StaDesc site : staDescs) {
Map<String, Object> map = new HashMap<>();
map.put("siteId", site.getStnNo());
@@ -84,12 +79,8 @@
}
EntityWrapper<StaDesc> wrapper2 = new EntityWrapper<>();
- wrapper2.eq("type_no", 103);
- wrapper.orderBy("stn_no", true);
+ wrapper2.eq("type_no", 103).orderBy("stn_no", true);
List<StaDesc> staDescs2 = staDescService.selectList(wrapper2);
- // List<Integer> pickOutSite = staDescs2.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
-
-// List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
for (StaDesc site : staDescs2) {
Map<String, Object> map = new HashMap<>();
map.put("siteId", site.getStnNo());
--
Gitblit v1.9.1