From c94688c24570d094cf583c68d9cfcd01aff99e4c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 28 十一月 2024 10:17:55 +0800
Subject: [PATCH] #pda
---
src/main/java/com/zy/asrs/controller/WorkController.java | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 0d6540d..5123cc4 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -23,10 +23,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -65,7 +62,7 @@
@RequestMapping("/available/take/site")
@ManagerAuth()
public R availableTakeSite(){
- List<Map<String, Object>> result = new ArrayList<>();
+ Set<Map<String, Object>> result = new HashSet<>();
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
// 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
@@ -76,7 +73,7 @@
for (Integer siteId : outSite) {
Map<String, Object> map = new HashMap<>();
map.put("siteId", siteId);
- map.put("desc", Utils.getStaName(siteId));
+ map.put("desc","["+ Utils.getStaName(siteId)+"]");
result.add(map);
}
@@ -89,16 +86,10 @@
// List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
for (Integer siteId : pickOutSite) {
- for (Map<String, Object> map1: result){
- if (map1.get(siteId) == null){
- Map<String, Object> map = new HashMap<>();
- map.put("siteId", siteId);
- map.put("desc", Utils.getStaName(siteId));
- result.add(map);
- }
-
- }
-
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", siteId);
+ map.put("desc","["+ Utils.getStaName(siteId)+"]");
+ result.add(map);
}
return R.ok().add(result);
}
--
Gitblit v1.9.1