From 676fcea006e805e969bf557cf29289d2b301f9d8 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期五, 20 五月 2022 17:21:26 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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..f3ea386 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);
@@ -131,7 +135,7 @@
throw new CoolException("璇烽�夋嫨瀹㈡埛");
}
Cstmr cstmr = cstmrService.selectOne(new EntityWrapper<Cstmr>()
- .eq("id",Long.parseLong(item.getUuid())));
+ .eq("id",Long.parseLong(item.getCstmrUuid())));
if (Cools.isEmpty(cstmr)) {
throw new CoolException("鎵句笉鍒拌瀹㈡埛,璇锋鏌�");
}
@@ -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