From 73ee27bdeb5900547a15d00505f2cb3b7ecadbf2 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 18 四月 2025 14:32:21 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/WorkController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 692f5fa..437dff3 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -72,28 +72,28 @@
Set<Map<String, Object>> result = new HashSet<>();
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
// 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
+ //RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
wrapper.eq("type_no",101);
List<StaDesc> staDescs = staDescService.selectList(wrapper);
- List<Integer> outSite = staDescs.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
+ // List<Integer> outSite = staDescs.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
// List<Integer> outSite = basDevpService.getAvailableOutSite(101);
- for (Integer siteId : outSite) {
+ for (StaDesc site : staDescs) {
Map<String, Object> map = new HashMap<>();
- map.put("siteId", siteId);
- map.put("desc","["+ Utils.getStaName(siteId)+"]");
+ map.put("siteId", site.getStnNo());
+ map.put("desc", site.getStnDesc()+site.getStnNo());
result.add(map);
}
EntityWrapper<StaDesc> wrapper2 = new EntityWrapper<>();
wrapper2.eq("type_no",103);
List<StaDesc> staDescs2 = staDescService.selectList(wrapper2);
- List<Integer> pickOutSite = staDescs2.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
+ // List<Integer> pickOutSite = staDescs2.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
// List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
- for (Integer siteId : pickOutSite) {
+ for (StaDesc site : staDescs2) {
Map<String, Object> map = new HashMap<>();
- map.put("siteId", siteId);
- map.put("desc","["+ Utils.getStaName(siteId)+"]");
+ map.put("siteId", site.getStnNo());
+ map.put("desc", site.getStnDesc()+site.getStnNo());
result.add(map);
}
return R.ok().add(result);
--
Gitblit v1.9.1