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 07fe50e4..3fcc00bf 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 @@ -218,7 +218,15 @@ public class DataCenterRest { List projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid()); sendBodyMM.put("orgPath",projectInfo.get(0).getEnterpriseSid()); List projectDetailsVos=c.getList(new RestTemplate().postForEntity(a, sendBodyMM, String.class),ProjectDetailsVo.class); - + for (ProjectDetailsVo projectDetailsVo : projectDetailsVos) { + List infos= crmMapper.getProjectByShSid(projectDetailsVo.getSid()); + for (ProjectInfo info : infos) { + if(info!=null){ + String nodde=crmMapper.getNodeValueByProjectSid(info.getProjectSid()); + projectDetailsVo.setCreditStage(nodde); + } + } + } return rb.success().setData(projectDetailsVos); } @@ -235,7 +243,6 @@ public class DataCenterRest { List infos= crmMapper.getProjectByShSid(projectDetailsVo.getSid()); List sids=new ArrayList<>(); for (ProjectInfo info : infos) { - if(info!=null){ String nodde=crmMapper.getNodeValueByProjectSid(info.getProjectSid()); projectDetailsVo.setCreditStage(nodde); @@ -291,11 +298,14 @@ public class DataCenterRest { if(indexVoBaseResponseListObj.getCount()!=0){ projectDetailsVo.setTotalDayPower(indexVoBaseResponseListObj.getList().get(0).getTotal_day_power().equals(null)?"0":indexVoBaseResponseListObj.getList().get(0).getTotal_day_power()); } - List list=crmMapper.getProjectFilesByMainSid(sids.toArray()); - if(list.size()!=0){ - projectDetailsVo.setUrlsVos(list); + if(sids.size()!=0){ + List list=crmMapper.getProjectFilesByMainSid(sids.toArray()); + if(list.size()!=0){ + projectDetailsVo.setUrlsVos(list); + } } + return rb.success().setData(projectDetailsVo); } @@ -639,7 +649,8 @@ public class DataCenterRest { projectDetailsVo.setMoney(projectDetailsVo.getMoney().add(vo.getMoney())); projectDetailsVo.setTbdate(vo.getTbdate()); }else{ - projectDetailsVo.setHkMoney(projectDetailsVo.getMoney().add(vo.getMoney())); + projectDetailsVo.setHkMoney(projectDetailsVo.getHkMoney().add(vo.getMoney())); + projectDetailsVo.setHkdate(vo.getTbdate()); } s.add(vo.getSid()); } @@ -682,9 +693,11 @@ public class DataCenterRest { if(indexVoBaseResponseListObj.getCount()!=0){ projectDetailsVo.setTotalDayPower(indexVoBaseResponseListObj.getList().get(0).getTotal_day_power().equals(null)?"0":indexVoBaseResponseListObj.getList().get(0).getTotal_day_power()); } - List list=crmMapper.getProjectFilesByMainSid(sids.toArray()); - if(list.size()!=0){ - projectDetailsVo.setUrlsVos(list); + if(sids.size()!=0){ + List list=crmMapper.getProjectFilesByMainSid(sids.toArray()); + if(list.size()!=0){ + projectDetailsVo.setUrlsVos(list); + } } } js1.setRecords(projectDetailsVos); diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ProjectDetailsVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ProjectDetailsVo.java index ab41950d..bfd98df6 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ProjectDetailsVo.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ProjectDetailsVo.java @@ -42,7 +42,8 @@ public class ProjectDetailsVo { private String creditNature;//用信性质 private String creditStage;//用信阶段 private BigDecimal hkMoney=new BigDecimal(0); -// List creditList =new ArrayList<>(); + private String hkdate;//放款日期 + // List creditList =new ArrayList<>(); List projectEngineeringList=new ArrayList<>(); ProjectEngineeringProgressVo projectEngineeringProgress=new ProjectEngineeringProgressVo(); List projectSupervisionLogList=new ArrayList<>(); diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java index 7b1c05d9..5583ed8f 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java @@ -186,7 +186,7 @@ public interface CrmMapper extends BaseMapper { List getEnterByProjetSid(@Param("projectSid") String projectSid); @Select("select * from storehouse_project where shSid=#{shSid}") List getProjectByShSid(@Param("shSid") String shSid); - @Select("select type,money ,tbdate ,expectedCompletionDate ,expectedDeliveryDate,creditNature,creditStage from project_credit_balance where projectSid=#{projectSid} and type='1'") + @Select("select type,money ,tbdate ,expectedCompletionDate ,expectedDeliveryDate,creditNature,creditStage from project_credit_balance where projectSid=#{projectSid}") List getBalanceByProjectSid(@Param("projectSid") String projectSid); @Select("select * from project_engineering_progress where projectSid=#{projectSid} order by orderDate desc") List getEngineeringByProject(@Param("projectSid") String projectSid);