From 64f0ef24285518708ecb20a82d3cf38e424790e8 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期六, 15 一月 2022 08:33:30 +0800
Subject: [PATCH] 提交更新
---
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
index 1f81ed4..efb12a6 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -46,7 +46,10 @@
@RequestParam(required = false) String orderByType,
@RequestParam Map<String, Object> param) {
String target = (String) param.get("items");
+ String search = (String) param.get("id");
param.remove("items");
+ param.remove("id");
+
EntityWrapper<ProjectPlan> wrapper = new EntityWrapper<>();
if (target != null && !target.equals("0")){
wrapper.eq("item_id",target);
@@ -61,12 +64,17 @@
excludeTrash(param);
convert(param, wrapper);
+// HashSet<String> excludeItems = new HashSet<>();
+// excludeItems.add("id");
+// excludeItems.add("item_id");
+// excludeItems.add("weight_num");
+// excludeItems.add("create_time");
+// excludeItems.add("create_id");
+// excludeItems.add("modify_time");
+// excludeItems.add("modify_id");
+//
+// allLike(ProjectPlan.class,excludeItems,wrapper, (String) param.get("id"));
wrapper.orderBy("item_id");
-
-
-// if (!Cools.isEmpty(orderByField)) {
-// wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
-// }
return R.ok(projectPlanService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -94,6 +102,7 @@
if (!Cools.isEmpty(checkExist)) {
throw new CoolException("鏉冮噸鍊煎啿绐�,璇锋鏌�");
}
+
FlowStatus id = flowStatusService.selectOne(new EntityWrapper<FlowStatus>()
.eq("id", projectPlan.getFlowId()));
if (!Cools.isEmpty(id)) {
@@ -113,6 +122,10 @@
if (Cools.isEmpty(projectPlan) || null == projectPlan.getId()) {
return R.error();
+ }
+
+ if (projectPlan.getDelay() < 0){
+ throw new CoolException("寤舵湡澶╂暟涓嶅彲涓鸿礋鏁�");
}
projectPlan.setModifyTime(new Date());
@@ -284,19 +297,26 @@
List<Item> items = itemService.selectList(new EntityWrapper<Item>()
.eq("status","1"));
List<ItemsDTO> itemsDTOs = new ArrayList<>();
- for (Item item : items) {
- ItemsDTO itemsDTO = new ItemsDTO();
+ for (Item item : items) {
+
+ ItemsDTO itemsDTO = new ItemsDTO();
+ List<FlowsDTO> flows = new ArrayList<>();
itemsDTO.setId(item.getName());
- itemsDTO.setStartDay(item.getStartTime());
- itemsDTO.setEndDay(item.getEndTime());
+ itemsDTO.setStartDay(item.getStartTime$());
+ itemsDTO.setEndDay(item.getEndTime$());
List<ProjectPlan> allPlans = projectPlanService.selectList(new EntityWrapper<ProjectPlan>()
.eq("item_id", item.getId()));
for (ProjectPlan projectPlan : allPlans) {
- projectPlan.setFlowName(projectPlan.getFlowId$());
+ FlowsDTO flowsDTO = new FlowsDTO();
+ flowsDTO.setName(projectPlan.getFlowId$());
+ flowsDTO.setStartTime(projectPlan.getStartTime$());
+ flowsDTO.setEndTime$(projectPlan.getEndTime$());
+ flowsDTO.setRealStartTime$(projectPlan.getRealStartTime$());
+ flowsDTO.setRealEndTime$(projectPlan.getRealEndTime$());
+ flows.add(flowsDTO);
}
-
- itemsDTO.setNodes(allPlans);
+ itemsDTO.setNodes(flows);
itemsDTOs.add(itemsDTO);
}
return R.ok().add(itemsDTOs);
--
Gitblit v1.9.1