1

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java

@@ -191,7 +191,8 @@ public class DataCenterRest {
         if(StringUtils.isNotBlank(query.getName())){
             sendBodyMM.put("name",query.getName());
         }
-        sendBodyMM.put("orgPath",query.getProjectSid());
+        List<ProjectInfo> projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid());
+        sendBodyMM.put("orgPath",projectInfo.get(0).getEnterpriseSid());
         RestTemplate restTemplate = new RestTemplate();
         ResponseEntity<String> forEntity = restTemplate.postForEntity(a, sendBodyMM, String.class);
         com.alibaba.fastjson.JSONObject jsonObject=new com.alibaba.fastjson.JSONObject();
@@ -326,7 +327,7 @@ public class DataCenterRest {
         int zj=0;
         int jg=0;
         for (ProjectInfo infoList : projectInfoList) {
-//            int a=crmMapper.getPhaseByProject(projectInfo.getSid(),infoList.getNodeValue());
+            if(StringUtils.isNotBlank(infoList.getNodeValue())){
                 if (infoList.getNodeValue().equals("在途")){
                     dd++;
                 }
@@ -337,10 +338,13 @@ public class DataCenterRest {
                     jg++;
                 }
             }
+//            int a=crmMapper.getPhaseByProject(projectInfo.getSid(),infoList.getNodeValue());
+        }
         List<WarehouseInfoVoSheng1> warehouseInfoVoSheng1s=new ArrayList<>();
         for (WarehouseInfoVoSheng vo : vos) {
             List<ShPhaseRecordVo> c=crmMapper.getPhaseByProject(vo.getList().stream().map(WarehouseInfoVo::getSid).toArray());
             for (ShPhaseRecordVo shPhaseRecordVo : c) {
+                if(StringUtils.isNotBlank(shPhaseRecordVo.getNodeValue())){
                     if (shPhaseRecordVo.getNodeValue().equals("在途")){
                         vo.setDd(vo.getDd()+1);
                     }
@@ -351,6 +355,7 @@ public class DataCenterRest {
                         vo.setJg(vo.getDd()+1);
                     }
                 }
+            }
             if(c.size()!=0){
                 WarehouseInfoVoSheng1 warehouseInfoVoSheng1=new WarehouseInfoVoSheng1();
                 warehouseInfoVoSheng1.setName(vo.getBelongingPlace());