From 073ba9704e011536043aa2c51c62fa7b1549760e Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Wed, 6 Nov 2024 14:01:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=B1=E6=B5=B7=E6=95=B0=E6=8D=AE=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/biz/datacenter/DataCenterRest.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java index 3fcc00bf..9967e0f9 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java +++ b/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 projectDetailsVos=c.getList(new RestTemplate().postForEntity(a, sendBodyMM, String.class),ProjectDetailsVo.class); for (ProjectDetailsVo projectDetailsVo : projectDetailsVos) { List infos= crmMapper.getProjectByShSid(projectDetailsVo.getSid()); + List 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()); }