销帮帮完成工单

mjava-cloudpure/src/main/java/com/malk/cloudpure/controller/XBBController.java

@@ -13,10 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -121,7 +118,6 @@ private Long getWorkOrderInfo(@RequestParam String workOrderSerierNO) {
     Map workOrderNo = (Map) workOrderList.get(0);
     Long dataId = Long.valueOf(workOrderNo.get("dataId").toString());
     return dataId ;
-
 }
 
 
@@ -136,9 +132,13 @@ private Long getWorkOrderInfo(@RequestParam String workOrderSerierNO) {
         try{
             log.info("完成工单, {}", data);
             McException.assertParamException_Null(data, "workOrderId");
-            Long dataId = getWorkOrderInfo(data.get("workOrderId"));
-            Map result = xbbClient.workOrderComplete(dataId);
-            return McR.success(result);
+            if(!data.get("projectType").equals("工时服务")){
+                Long dataId = getWorkOrderInfo(data.get("workOrderId"));
+                Map result = xbbClient.workOrderComplete(dataId);
+                return McR.success(result);
+            }else{
+                return McR.success();
+            }
         }catch(Exception e){
             return McR.errorParam(e.getMessage());
         }