1

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

@@ -219,11 +219,8 @@ public class DataCenterRest {
         Integer jsonObject1 = JSONObject.parseObject(forEntity1.getBody()).getInteger("data");
         shDateCenterVo.setDownstreamEnterprises(jsonObject);
         shDateCenterVo.setUpstreamEnterprises(jsonObject1);
-//        shDateCenterVo.setDownstreamEnterprises(1);
-//        shDateCenterVo.setUpstreamEnterprises(1);
         List<ProjectInfo> projectInfoList=crmMapper.getProjectcs(projectInfo.getEnterpriseSid());
         List<ProjectInfo> projectInfoLists=crmMapper.getNodeValue(projectInfo.getEnterpriseSid());
-
         for (ProjectInfo info : projectInfoList) {
             shDateCenterVo.setTotalSxLimit(shDateCenterVo.getTotalSxLimit().add(info.getCreditLimitN()));
             shDateCenterVo.setTotalYxLimit(shDateCenterVo.getTotalYxLimit().add(info.getUseLimitN()));
@@ -375,14 +372,12 @@ public class DataCenterRest {
         ResultBean rb=new ResultBean();
         Map<String,Object> map=new HashMap<>();
         ProjectInfo projectInfo=crmMapper.getProject(query.getProjectSid());
-        List<ProjectInfo> projectInfoList=crmMapper.getProjectcs(projectInfo.getEnterpriseSid());
         List<ProjectInfo> projectInfoLists=crmMapper.getNodeValue(projectInfo.getEnterpriseSid());
         for (ProjectInfo infoList : projectInfoLists) {
             Integer i= crmMapper.getPhaseFilesCount(projectInfo.getEnterpriseSid(),infoList.getNodeValue());
             map.put(PinYinUtils.getPinYinName(infoList.getNodeValue()),i.toString());
         }
         List<ProjectRecordVo> projectRecordVos=crmMapper.getPhaseFilesByEnterpriseSid(projectInfo.getEnterpriseSid());
-//        projectRecordVos.stream().filter(s->ProjectRecordVo.get)
         map.put("list",projectRecordVos);
         return rb.success().setData(map);
     }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java

@@ -144,6 +144,6 @@ public interface CrmMapper extends BaseMapper<ProjectInfo> {
             "\tleft join project_files c on c.mainSid=b.sid\n" +
             "\tleft join project_phase d on d.projectSid =b.sid\n" +
             "WHERE\n" +
-            "\ta.enterpriseSid = #{enterpriseSid}")
+            "\ta.enterpriseSid = #{enterpriseSid} and url is not NULL")
     List<ProjectRecordVo> getPhaseFilesByEnterpriseSid(@Param("enterpriseSid") String enterpriseSid);
 }