From 03b41fa7164bb7dc5a8bd17a06cfceed43e65617 Mon Sep 17 00:00:00 2001
From: whycq0520 <91384184@qq.com>
Date: 星期四, 24 三月 2022 12:56:44 +0800
Subject: [PATCH] # ycq
---
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 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 ce70745..a21352c 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -46,17 +46,25 @@
@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<>();
- wrapper.eq("item_id",target);
+ if (target != null && !target.equals("0")){
+ wrapper.eq("item_id",target);
+ }else{
+ List<Item> items = itemService.selectList(new EntityWrapper<Item>()
+ .eq("status", "2"));
+ for (Item item : items) {
+ wrapper.ne("item_id",item.getId());
+ }
+
+ }
excludeTrash(param);
convert(param, wrapper);
- wrapper.orderBy("weight_num");
-// if (!Cools.isEmpty(orderByField)) {
-// wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
-// }
+ wrapper.orderBy("item_id");
return R.ok(projectPlanService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -84,6 +92,7 @@
if (!Cools.isEmpty(checkExist)) {
throw new CoolException("鏉冮噸鍊煎啿绐�,璇锋鏌�");
}
+
FlowStatus id = flowStatusService.selectOne(new EntityWrapper<FlowStatus>()
.eq("id", projectPlan.getFlowId()));
if (!Cools.isEmpty(id)) {
@@ -103,6 +112,10 @@
if (Cools.isEmpty(projectPlan) || null == projectPlan.getId()) {
return R.error();
+ }
+
+ if (projectPlan.getDelay() < 0){
+ throw new CoolException("寤舵湡澶╂暟涓嶅彲涓鸿礋鏁�");
}
projectPlan.setModifyTime(new Date());
@@ -163,7 +176,7 @@
public R allProjects() {
List<Item> items = itemService.selectList(new EntityWrapper<Item>()
- .eq("status","1"));
+ .ne("status","2"));
List<Map<String, Object>> result = new ArrayList<>();
for (Item item : items) {
@@ -274,23 +287,32 @@
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);
+ itemsDTO.setItems(items);
itemsDTOs.add(itemsDTO);
}
return R.ok().add(itemsDTOs);
}
+
}
--
Gitblit v1.9.1