我的申请-审批中-审批时间置为空

zqrferrari · Dec 1, 2021 · 61f99e4 · 61f99e4
1 parent d5348bc
commit 61f99e4
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/...manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/OrderConverter.java b/...manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/OrderConverter.java
@@ -1,15 +1,16 @@
 package com.xiaojukeji.kafka.manager.web.converters;
 
-import com.xiaojukeji.kafka.manager.common.entity.ao.account.Account;
 import com.xiaojukeji.kafka.manager.bpm.common.OrderResult;
+import com.xiaojukeji.kafka.manager.bpm.common.OrderStatusEnum;
 import com.xiaojukeji.kafka.manager.bpm.common.entry.BaseOrderDetailData;
+import com.xiaojukeji.kafka.manager.common.entity.ao.account.Account;
+import com.xiaojukeji.kafka.manager.common.entity.pojo.OrderDO;
 import com.xiaojukeji.kafka.manager.common.entity.vo.common.AccountVO;
 import com.xiaojukeji.kafka.manager.common.entity.vo.normal.order.OrderResultVO;
 import com.xiaojukeji.kafka.manager.common.entity.vo.normal.order.OrderVO;
 import com.xiaojukeji.kafka.manager.common.entity.vo.normal.order.detail.OrderDetailBaseVO;
 import com.xiaojukeji.kafka.manager.common.utils.CopyUtils;
 import com.xiaojukeji.kafka.manager.common.utils.ValidateUtils;
-import com.xiaojukeji.kafka.manager.common.entity.pojo.OrderDO;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -41,8 +42,9 @@ public static OrderVO convert2OrderVO(OrderDO orderDO) {
         }
         OrderVO orderVO = new OrderVO();
         CopyUtils.copyProperties(orderVO, orderDO);
-        orderVO.setGmtCreate(orderDO.getGmtCreate());
-        orderVO.setGmtHandle(orderDO.getGmtHandle());
+        if (OrderStatusEnum.WAIT_DEAL.getCode().equals(orderDO.getStatus())) {
+            orderVO.setGmtHandle(null);
+        }
         return orderVO;
     }