From 8745b76acfd45eadd720d7ce6d87c77e6e0682b9 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 06 九月 2022 12:46:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 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 01e0660..b89302d 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -30,6 +30,10 @@
private ProjectPlanService planService;
@Autowired
private FlowStatusService flowStatusService;
+ @Autowired
+ private CstmrService cstmrService;
+ @Autowired
+ private ProjectStatusService projectStatusService;
@RequestMapping(value = "/item/{id}/auth")
@ManagerAuth
@@ -43,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);
@@ -106,10 +112,16 @@
@RequestMapping(value = "/item/add/auth")
@ManagerAuth
public R add(Item item) {
-
+ /**
+ * 鎺х
+ */
+ if (Cools.isEmpty(item.getHostId()) || item.getHostId() == 0){
+ item.setHostId(1L);
+ }
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
+
//item.setType("1");
// if (!item.getType().equals("1")) {
// throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
@@ -122,7 +134,17 @@
if (item.getRealMonth() < 0){
throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
}
-
+ if (Cools.isEmpty(item.getCstmrUuid())) {
+ throw new CoolException("璇烽�夋嫨瀹㈡埛");
+ }
+ Cstmr cstmr = cstmrService.selectOne(new EntityWrapper<Cstmr>()
+ .eq("id",Long.parseLong(item.getCstmrUuid())));
+ if (Cools.isEmpty(cstmr)) {
+ throw new CoolException("鎵句笉鍒拌瀹㈡埛,璇锋鏌�");
+ }
+ item.setCustMan(cstmr.getName());
+ item.setCustMobile(cstmr.getTel());
+ item.setCustAdress(cstmr.getAddr());
item.setHostId(getHostId());
item.setCreateBy(getUserId());
item.setCreateTime(new Date());
@@ -141,6 +163,7 @@
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
+
// item.setType("1");
// if (!item.getType().equals("1")) {
// throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
@@ -266,5 +289,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