山海数据大屏

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

@@ -220,12 +220,20 @@ public class DataCenterRest {
         List<ProjectDetailsVo> projectDetailsVos=c.getList(new RestTemplate().postForEntity(a, sendBodyMM, String.class),ProjectDetailsVo.class);
         for (ProjectDetailsVo projectDetailsVo : projectDetailsVos) {
             List<ProjectInfo> infos= crmMapper.getProjectByShSid(projectDetailsVo.getSid());
+            List<String> list=new ArrayList<>();
             for (ProjectInfo info : infos) {
                 if(info!=null){
                     String nodde=crmMapper.getNodeValueByProjectSid(info.getProjectSid());
-                    projectDetailsVo.setCreditStage(nodde);
+                    list.add(nodde);
                 }
             }
+            if(list.stream().anyMatch(s->s.equals("在途"))){
+                projectDetailsVo.setCreditStage("在途");
+            }else if(list.stream().anyMatch(s->s.equals("在建"))){
+                projectDetailsVo.setCreditStage("在建");
+            }else {
+                projectDetailsVo.setCreditStage("竣工");
+            }
         }
         return rb.success().setData(projectDetailsVos);
     }
@@ -261,7 +269,8 @@ public class DataCenterRest {
                         projectDetailsVo.setTbdate(vo.getTbdate());
                         projectDetailsVo.setMoney(projectDetailsVo.getMoney().add(vo.getMoney()));
                     }else{
-                        projectDetailsVo.setHkMoney(projectDetailsVo.getMoney().add(vo.getMoney()));
+                        projectDetailsVo.setHkMoney(projectDetailsVo.getHkMoney().add(vo.getMoney()));
+                        projectDetailsVo.setHkdate(vo.getTbdate());
                     }
                     s.add(vo.getSid());
                 }