项目库详情修改

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/ConstructionPlanReviewHandle.java

@@ -4,6 +4,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
 
+import cn.hutool.core.collection.CollUtil;
 import com.google.common.collect.Lists;
 import com.ningdatech.basic.util.NdDateUtils;
 import com.ningdatech.pmapi.todocenter.utils.BuildUserUtils;
@@ -72,14 +73,18 @@ public class ConstructionPlanReviewHandle extends AbstractProcessBusinessHandle
 
         // 装配节点审核人员信息
         List<ProgressNode> progressInfo = instanceDetail.getProgressInfo();
-        buildUserUtils.buildUserByProcessInfo(progressInfo);
-
-        // 根据流程处理详情获取流程完成时间
-        if(StepStatusEnum.contains(processDetailVO.getStepStatus(),
-                Lists.newArrayList(StepStatusEnum.REJECTED,
-                        StepStatusEnum.COMPLETED))){
-            ProgressNode progressNode = progressInfo.get(progressInfo.size() - 1);
-            LocalDateTime finishTime = NdDateUtils.date2LocalDateTime(progressNode.getFinishTime());
+        if (CollUtil.isNotEmpty(progressInfo)) {
+            buildUserUtils.buildUserByProcessInfo(progressInfo);
+            // 根据流程处理详情获取流程完成时间
+            if (StepStatusEnum.contains(processDetailVO.getStepStatus(),
+                    Lists.newArrayList(StepStatusEnum.REJECTED,
+                            StepStatusEnum.COMPLETED))) {
+                ProgressNode progressNode = progressInfo.get(progressInfo.size() - 1);
+                LocalDateTime finishTime = NdDateUtils.date2LocalDateTime(progressNode.getFinishTime());
+                processDetailVO.setFinishTime(finishTime);
+            }
+        }else {
+            LocalDateTime finishTime = NdDateUtils.date2LocalDateTime(instanceDetail.getStartTime());
             processDetailVO.setFinishTime(finishTime);
         }
         processDetailVO.setProcessProgressVo(instanceDetail);

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/DeptUnitedReviewHandle.java

@@ -4,6 +4,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
 
+import cn.hutool.core.collection.CollUtil;
 import com.google.common.collect.Lists;
 import com.ningdatech.basic.util.NdDateUtils;
 import com.ningdatech.pmapi.todocenter.utils.BuildUserUtils;
@@ -69,13 +70,18 @@ public class DeptUnitedReviewHandle extends AbstractProcessBusinessHandle {
         }
         // 装配节点审核人员信息
         List<ProgressNode> progressInfo = instanceDetail.getProgressInfo();
-        buildUserUtils.buildUserByProcessInfo(progressInfo);
-        // 根据流程处理详情获取流程完成时间
-        if(StepStatusEnum.contains(processDetailVO.getStepStatus(),
-                Lists.newArrayList(StepStatusEnum.REJECTED,
-                        StepStatusEnum.COMPLETED))){
-            ProgressNode progressNode = progressInfo.get(progressInfo.size() - 1);
-            LocalDateTime finishTime = NdDateUtils.date2LocalDateTime(progressNode.getFinishTime());
+        if (CollUtil.isNotEmpty(progressInfo)) {
+            buildUserUtils.buildUserByProcessInfo(progressInfo);
+            // 根据流程处理详情获取流程完成时间
+            if (StepStatusEnum.contains(processDetailVO.getStepStatus(),
+                    Lists.newArrayList(StepStatusEnum.REJECTED,
+                            StepStatusEnum.COMPLETED))) {
+                ProgressNode progressNode = progressInfo.get(progressInfo.size() - 1);
+                LocalDateTime finishTime = NdDateUtils.date2LocalDateTime(progressNode.getFinishTime());
+                processDetailVO.setFinishTime(finishTime);
+            }
+        }else {
+            LocalDateTime finishTime = NdDateUtils.date2LocalDateTime(instanceDetail.getStartTime());
             processDetailVO.setFinishTime(finishTime);
         }
         processDetailVO.setProcessProgressVo(instanceDetail);

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/PreliminaryPreviewHandle.java

@@ -1,5 +1,6 @@
 package com.ningdatech.pmapi.projectlib.handle;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Lists;
 import com.ningdatech.basic.util.NdDateUtils;
@@ -69,14 +70,18 @@ public class PreliminaryPreviewHandle extends AbstractProcessBusinessHandle {
 
         // 装配节点审核人员信息
         List<ProgressNode> progressInfo = instanceDetail.getProgressInfo();
-        buildUserUtils.buildUserByProcessInfo(progressInfo);
-
-        // 根据流程处理详情获取流程完成时间
-        if(StepStatusEnum.contains(processDetailVO.getStepStatus(),
-                Lists.newArrayList(StepStatusEnum.REJECTED,
-                        StepStatusEnum.COMPLETED))){
-            ProgressNode progressNode = progressInfo.get(progressInfo.size() - 1);
-            LocalDateTime finishTime = NdDateUtils.date2LocalDateTime(progressNode.getFinishTime());
+        if (CollUtil.isNotEmpty(progressInfo)) {
+            buildUserUtils.buildUserByProcessInfo(progressInfo);
+            // 根据流程处理详情获取流程完成时间
+            if (StepStatusEnum.contains(processDetailVO.getStepStatus(),
+                    Lists.newArrayList(StepStatusEnum.REJECTED,
+                            StepStatusEnum.COMPLETED))) {
+                ProgressNode progressNode = progressInfo.get(progressInfo.size() - 1);
+                LocalDateTime finishTime = NdDateUtils.date2LocalDateTime(progressNode.getFinishTime());
+                processDetailVO.setFinishTime(finishTime);
+            }
+        }else {
+            LocalDateTime finishTime = NdDateUtils.date2LocalDateTime(instanceDetail.getStartTime());
             processDetailVO.setFinishTime(finishTime);
         }
         processDetailVO.setProcessProgressVo(instanceDetail);

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/ProjectFinalInspectionHandle.java

@@ -3,6 +3,8 @@ package com.ningdatech.pmapi.projectlib.handle;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
+
+import cn.hutool.core.collection.CollUtil;
 import com.google.common.collect.Lists;
 import com.ningdatech.basic.util.NdDateUtils;
 import com.ningdatech.pmapi.projectlib.enumeration.InstTypeEnum;
@@ -72,14 +74,18 @@ public class ProjectFinalInspectionHandle extends AbstractProcessBusinessHandle
 
         // 装配节点审核人员信息
         List<ProgressNode> progressInfo = instanceDetail.getProgressInfo();
-        buildUserUtils.buildUserByProcessInfo(progressInfo);
-
-        // 根据流程处理详情获取流程完成时间
-        if(StepStatusEnum.contains(processDetailVO.getStepStatus(),
-                Lists.newArrayList(StepStatusEnum.REJECTED,
-                StepStatusEnum.COMPLETED))){
-            ProgressNode progressNode = progressInfo.get(progressInfo.size() - 1);
-            LocalDateTime finishTime = NdDateUtils.date2LocalDateTime(progressNode.getFinishTime());
+        if (CollUtil.isNotEmpty(progressInfo)) {
+            buildUserUtils.buildUserByProcessInfo(progressInfo);
+            // 根据流程处理详情获取流程完成时间
+            if (StepStatusEnum.contains(processDetailVO.getStepStatus(),
+                    Lists.newArrayList(StepStatusEnum.REJECTED,
+                            StepStatusEnum.COMPLETED))) {
+                ProgressNode progressNode = progressInfo.get(progressInfo.size() - 1);
+                LocalDateTime finishTime = NdDateUtils.date2LocalDateTime(progressNode.getFinishTime());
+                processDetailVO.setFinishTime(finishTime);
+            }
+        }else {
+            LocalDateTime finishTime = NdDateUtils.date2LocalDateTime(instanceDetail.getStartTime());
             processDetailVO.setFinishTime(finishTime);
         }
         processDetailVO.setProcessProgressVo(instanceDetail);

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/UnitInnerAuditHandle.java

@@ -1,6 +1,7 @@
 package com.ningdatech.pmapi.projectlib.handle;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -68,14 +69,18 @@ public class UnitInnerAuditHandle extends AbstractProcessBusinessHandle {
 
         // 装配节点审核人员信息
         List<ProgressNode> progressInfo = instanceDetail.getProgressInfo();
-        buildUserUtils.buildUserByProcessInfo(progressInfo);
-
-        // 根据流程处理详情获取流程完成时间
-        if(StepStatusEnum.contains(processDetailVO.getStepStatus(),
-                Lists.newArrayList(StepStatusEnum.REJECTED,
-                        StepStatusEnum.COMPLETED))){
-            ProgressNode progressNode = progressInfo.get(progressInfo.size() - 1);
-            LocalDateTime finishTime = NdDateUtils.date2LocalDateTime(progressNode.getFinishTime());
+        if (CollUtil.isNotEmpty(progressInfo)) {
+            buildUserUtils.buildUserByProcessInfo(progressInfo);
+            // 根据流程处理详情获取流程完成时间
+            if (StepStatusEnum.contains(processDetailVO.getStepStatus(),
+                    Lists.newArrayList(StepStatusEnum.REJECTED,
+                            StepStatusEnum.COMPLETED))) {
+                ProgressNode progressNode = progressInfo.get(progressInfo.size() - 1);
+                LocalDateTime finishTime = NdDateUtils.date2LocalDateTime(progressNode.getFinishTime());
+                processDetailVO.setFinishTime(finishTime);
+            }
+        }else {
+            LocalDateTime finishTime = NdDateUtils.date2LocalDateTime(instanceDetail.getStartTime());
             processDetailVO.setFinishTime(finishTime);
         }
         processDetailVO.setProcessProgressVo(instanceDetail);