From 40d710de7ef349e9f2e034c362633c641eef6157 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期五, 08 四月 2022 09:53:12 +0800
Subject: [PATCH] .

---
 src/main/java/zy/cloud/wms/manager/controller/ItemController.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
index f694ae0..a316a07 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -32,6 +32,8 @@
     private FlowStatusService flowStatusService;
     @Autowired
     private CstmrService cstmrService;
+    @Autowired
+    private ProjectStatusService projectStatusService;
 
     @RequestMapping(value = "/item/{id}/auth")
     @ManagerAuth
@@ -45,11 +47,13 @@
                   @RequestParam(defaultValue = "10")Integer limit,
                   @RequestParam(required = false)String orderByField,
                   @RequestParam(required = false)String orderByType,
+                  @RequestParam(required = false)String condition,
                   @RequestParam Map<String, Object> param){
         EntityWrapper<Item> wrapper = new EntityWrapper<>();
         HashSet<String> excludeField = new HashSet<>();
 
-        allLike(Item.class,excludeField,wrapper, (String) param.get("id"));
+        allLike(Item.class, param.keySet(), wrapper, condition);
+//        allLike(Item.class,excludeField,wrapper, (String) param.get("id"));
         excludeTrash(param);
         convert(param, wrapper);
         hostEq(wrapper);
@@ -282,5 +286,19 @@
 
         return R.ok();
     }
+    @RequestMapping(value = "/progressRate/auth")
+    @ManagerAuth
+    public R queryProgressRate(String condition) {
+        List<Map<String, Object>> result = new ArrayList<>();
+        List<ProjectStatus> projectStatuses = projectStatusService.selectList(null);
+        for (ProjectStatus projectStatus : projectStatuses) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", projectStatus.getId());
+            map.put("value", projectStatus.getStatusName());
+            result.add(map);
+        }
+
+        return R.ok(result);
+    }
 
 }

--
Gitblit v1.9.1