From 24f998b69143b99846b646d05ecf185058ae5072 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 25 三月 2022 10:43:44 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 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 a379794..e107a13 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -301,15 +301,61 @@
itemsDTO.setPlaninAmt(item.getPlaninAmt());
itemsDTO.setRealinAmt(item.getRealinAmt());
itemsDTO.setType(item.getType());
+
+ //add
+ Integer type = Integer.parseInt(item.getType());
+
List<ProjectPlan> allPlans = projectPlanService.selectList(new EntityWrapper<ProjectPlan>()
.eq("item_id", item.getId()));
for (ProjectPlan projectPlan : allPlans) {
FlowsDTO flowsDTO = new FlowsDTO();
flowsDTO.setName(projectPlan.getFlowId$());
- flowsDTO.setStartTime(projectPlan.getStartTime$());
- flowsDTO.setEndTime$(projectPlan.getEndTime$());
- flowsDTO.setRealStartTime$(projectPlan.getRealStartTime$());
- flowsDTO.setRealEndTime$(projectPlan.getRealEndTime$());
+ if(type==5) {
+ if(projectPlan.getFlowId()>=8 && projectPlan.getFlowId()<11){
+ flowsDTO.setStartTime("-");
+ flowsDTO.setEndTime$("-");
+ }else{
+ flowsDTO.setStartTime(projectPlan.getStartTime$());
+ flowsDTO.setEndTime$(projectPlan.getEndTime$());
+ flowsDTO.setRealStartTime$(projectPlan.getRealStartTime$());
+ flowsDTO.setRealEndTime$(projectPlan.getRealEndTime$());
+ }
+ }else if(type==1 || type==2 || type==6 || type==9) {
+ if((projectPlan.getFlowId()>=8&&projectPlan.getFlowId()<11) || projectPlan.getFlowId()==2 || projectPlan.getFlowId()==6){
+ flowsDTO.setStartTime("-");
+ flowsDTO.setEndTime$("-");
+ }else{
+ flowsDTO.setStartTime(projectPlan.getStartTime$());
+ flowsDTO.setEndTime$(projectPlan.getEndTime$());
+ flowsDTO.setRealStartTime$(projectPlan.getRealStartTime$());
+ flowsDTO.setRealEndTime$(projectPlan.getRealEndTime$());
+ }
+ }else if(type==3 || type==8){
+ if((projectPlan.getFlowId()>=8&&projectPlan.getFlowId()<11) || projectPlan.getFlowId()==6){
+ flowsDTO.setStartTime("-");
+ flowsDTO.setEndTime$("-");
+ }else{
+ flowsDTO.setStartTime(projectPlan.getStartTime$());
+ flowsDTO.setEndTime$(projectPlan.getEndTime$());
+ flowsDTO.setRealStartTime$(projectPlan.getRealStartTime$());
+ flowsDTO.setRealEndTime$(projectPlan.getRealEndTime$());
+ }
+ } else if(type==4){
+ if((projectPlan.getFlowId()>=8&&projectPlan.getFlowId()<11) || projectPlan.getFlowId()==6){
+ flowsDTO.setStartTime("-");
+ flowsDTO.setEndTime$("-");
+ }else{
+ flowsDTO.setStartTime(projectPlan.getStartTime$());
+ flowsDTO.setEndTime$(projectPlan.getEndTime$());
+ flowsDTO.setRealStartTime$(projectPlan.getRealStartTime$());
+ flowsDTO.setRealEndTime$(projectPlan.getRealEndTime$());
+ }
+ }else if(type==10){
+ flowsDTO.setStartTime(projectPlan.getStartTime$());
+ flowsDTO.setEndTime$(projectPlan.getEndTime$());
+ flowsDTO.setRealStartTime$(projectPlan.getRealStartTime$());
+ flowsDTO.setRealEndTime$(projectPlan.getRealEndTime$());
+ }
flows.add(flowsDTO);
}
itemsDTO.setNodes(flows);
--
Gitblit v1.9.1