From 2a6fce22845d4e8ddd25fcbb8766e423cb9f0bde Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Sat, 14 Sep 2024 11:09:23 +0800 Subject: [PATCH] 1 --- .../report/biz/datacenter/DataCenterRest.java | 44 ++++++++++--------- .../supervise/report/ds/crm/CrmMapper.java | 2 + 2 files changed, 26 insertions(+), 20 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 8cacd8dd..741ce783 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 @@ -209,9 +209,9 @@ public class DataCenterRest { public ResultBean projectOverview(@RequestBody DataCenterQuery query){ ResultBean rb=new ResultBean(); ShDateCenterVo shDateCenterVo=new ShDateCenterVo(); - ProjectInfo projectInfo=crmMapper.getProject(query.getProjectSid()); - String a1 ="https://wms.yxtsoft.com/apiv1/external/v1/crmcustomertemp/getCustomerByOrgSid?orgSid="+projectInfo.getEnterpriseSid(); - String b2 ="https://wms.yxtsoft.com/apiv1/external/apiadmin/supplierinfo/getSupplierCountByOrgSid?orgSid="+projectInfo.getEnterpriseSid(); + List projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid()); + String a1 ="https://wms.yxtsoft.com/apiv1/external/v1/crmcustomertemp/getCustomerByOrgSid?orgSid="+projectInfo.get(0).getEnterpriseSid(); + String b2 ="https://wms.yxtsoft.com/apiv1/external/apiadmin/supplierinfo/getSupplierCountByOrgSid?orgSid="+projectInfo.get(0).getEnterpriseSid(); RestTemplate restTemplate = new RestTemplate(); ResponseEntity forEntity = restTemplate.getForEntity(a1,String.class); ResponseEntity forEntity1 = restTemplate.getForEntity(b2,String.class); @@ -219,8 +219,8 @@ public class DataCenterRest { Integer jsonObject1 = JSONObject.parseObject(forEntity1.getBody()).getInteger("data"); shDateCenterVo.setDownstreamEnterprises(jsonObject); shDateCenterVo.setUpstreamEnterprises(jsonObject1); - List projectInfoList=crmMapper.getProjectcs(projectInfo.getEnterpriseSid()); - List projectInfoLists=crmMapper.getNodeValue(projectInfo.getEnterpriseSid()); + List projectInfoList=crmMapper.getProjectcs(projectInfo.get(0).getEnterpriseSid()); + List projectInfoLists=crmMapper.getNodeValue(projectInfo.get(0).getEnterpriseSid()); for (ProjectInfo info : projectInfoList) { shDateCenterVo.setTotalSxLimit(shDateCenterVo.getTotalSxLimit().add(info.getCreditLimitN())); shDateCenterVo.setTotalYxLimit(shDateCenterVo.getTotalYxLimit().add(info.getUseLimitN())); @@ -250,10 +250,11 @@ public class DataCenterRest { ResultBean rb=new ResultBean(); ShCreditBalanceVo shCreditBalanceVo=new ShCreditBalanceVo(); SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); - ProjectInfo projectInfo=crmMapper.getProject(query.getProjectSid()); +// ProjectInfo projectInfo=crmMapper.getProject(query.getProjectSid()); + List projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid()); String start =sdf.format(DateUtil.offsetDay(DateUtil.parse(query.getStartDate()), -7)); - List projectInfo1=crmMapper.sumMoney(projectInfo.getEnterpriseSid(), start,query.getStartDate()); - List shCreditBalanceVos=crmMapper.getRecordByEnterpriseSid(projectInfo.getEnterpriseSid(), start,query.getStartDate()); + List projectInfo1=crmMapper.sumMoney(projectInfo.get(0).getEnterpriseSid(), start,query.getStartDate()); + List shCreditBalanceVos=crmMapper.getRecordByEnterpriseSid(projectInfo.get(0).getEnterpriseSid(), start,query.getStartDate()); for (ProjectInfo info : projectInfo1) { if (info.getType().equals("1")){ @@ -270,9 +271,10 @@ public class DataCenterRest { public ResultBean> getEnterpriseInfo(@RequestBody DataCenterQuery query){ ResultBean rb=new ResultBean(); Map map=new HashMap<>(); - ProjectInfo projectInfo=crmMapper.getProject(query.getProjectSid()); - List projectInfoLists=crmMapper.getNodeValue(projectInfo.getEnterpriseSid()); - Integer w=crmMapper.getEnterpirseCount(projectInfo.getEnterpriseSid()); +// ProjectInfo projectInfo=crmMapper.getProject(query.getProjectSid()); + List projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid()); + List projectInfoLists=crmMapper.getNodeValue(projectInfo.get(0).getEnterpriseSid()); + Integer w=crmMapper.getEnterpirseCount(projectInfo.get(0).getEnterpriseSid()); map.put("loanEnterprise","1"); map.put("ensureEnterprise","1"); map.put("bank","1"); @@ -289,7 +291,7 @@ public class DataCenterRest { ShListVo v=new ShListVo(); v.setName(infoList.getNodeValue()); for (String s : a) { - ShPhaseRecordVo creditBalanceCrmVos=crmMapper.getPhaseRecordByProject(projectInfo.getEnterpriseSid(), s,infoList.getNodeValue()); + ShPhaseRecordVo creditBalanceCrmVos=crmMapper.getPhaseRecordByProject(projectInfo.get(0).getEnterpriseSid(), s,infoList.getNodeValue()); if(creditBalanceCrmVos!=null){ b.add(creditBalanceCrmVos.getTotal().intValue()); }else{ @@ -307,10 +309,11 @@ public class DataCenterRest { public ResultBean> projectOverviewMap(@RequestBody DataCenterQuery query){ ResultBean rb=new ResultBean(); Map map=new HashMap<>(); - ProjectInfo projectInfo=crmMapper.getProject(query.getProjectSid()); - List projectInfoList=crmMapper.getProjectcs(projectInfo.getEnterpriseSid()); - List projectInfoLists=crmMapper.getNodeValue(projectInfo.getEnterpriseSid()); - String a1 ="https://wms.yxtsoft.com/apiv1/external/apiadmin/warehouseinfo/getWarehouseCountByOrgSid?orgSid="+projectInfo.getEnterpriseSid(); +// ProjectInfo projectInfo=crmMapper.getProject(query.getProjectSid()); + List projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid()); + List projectInfoList=crmMapper.getProjectcs(projectInfo.get(0).getEnterpriseSid()); + List projectInfoLists=crmMapper.getNodeValue(projectInfo.get(0).getEnterpriseSid()); + String a1 ="https://wms.yxtsoft.com/apiv1/external/apiadmin/warehouseinfo/getWarehouseCountByOrgSid?orgSid="+projectInfo.get(0).getEnterpriseSid(); RestTemplate restTemplate = new RestTemplate(); ResponseEntity forEntity = restTemplate.getForEntity(a1,String.class); JSONArray jsonArray=com.alibaba.fastjson.JSONObject.parseObject(forEntity.getBody()).getJSONArray("data"); @@ -371,13 +374,14 @@ public class DataCenterRest { public ResultBean> projectReport(@RequestBody DataCenterQuery query){ ResultBean rb=new ResultBean(); Map map=new HashMap<>(); - ProjectInfo projectInfo=crmMapper.getProject(query.getProjectSid()); - List projectInfoLists=crmMapper.getNodeValue(projectInfo.getEnterpriseSid()); +// ProjectInfo projectInfo=crmMapper.getProject(query.getProjectSid()); + List projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid()); + List projectInfoLists=crmMapper.getNodeValue(projectInfo.get(0).getEnterpriseSid()); for (ProjectInfo infoList : projectInfoLists) { - Integer i= crmMapper.getPhaseFilesCount(projectInfo.getEnterpriseSid(),infoList.getNodeValue()); + Integer i= crmMapper.getPhaseFilesCount(projectInfo.get(0).getEnterpriseSid(),infoList.getNodeValue()); map.put(PinYinUtils.getPinYinName(infoList.getNodeValue()),i.toString()); } - List projectRecordVos=crmMapper.getPhaseFilesByEnterpriseSid(projectInfo.getEnterpriseSid()); + List projectRecordVos=crmMapper.getPhaseFilesByEnterpriseSid(projectInfo.get(0).getEnterpriseSid()); map.put("list",projectRecordVos); return rb.success().setData(map); } 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 54531e4a..b89f0ab4 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 @@ -146,4 +146,6 @@ public interface CrmMapper extends BaseMapper { "WHERE\n" + "\ta.enterpriseSid = #{enterpriseSid} and url is not NULL") List getPhaseFilesByEnterpriseSid(@Param("enterpriseSid") String enterpriseSid); + @Select("select * from enterprise_project where projectSid=#{projectSid}") + List getEnterByProjetSid(@Param("projectSid") String projectSid); }