From abf5172b9c1971cf662014f9d05646b5e0c1f03d Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Wed, 30 Oct 2024 15:47:25 +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

---
 .../ProjectCreditBalanceQuery.java            |   3 +-
 .../ProjectCreditBalanceMapper.xml            |   2 +-
 .../ProjectCreditBalanceService.java          |  21 ++-
 .../biz/projectshgm/ProjectShGmService.java   |   1 +
 .../biz/datacenter/DataCenterQuery.java       |   1 +
 .../report/biz/datacenter/DataCenterRest.java | 159 ++++++++++++++++--
 .../supervise/report/ds/crm/CrmMapper.java    |   3 +
 .../yxt/supervise/report/ds/crm/CrmMapper.xml |  17 ++
 .../report/ds/crm/ProjectRecordVo.java        |   1 +
 .../ProjectCreditBalanceQuery.java            |   3 +-
 .../report/shanhai/req/IndexQuery.java        |   2 +
 11 files changed, 190 insertions(+), 23 deletions(-)

diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceQuery.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceQuery.java
index ff47c089..2e33848c 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceQuery.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceQuery.java
@@ -52,7 +52,7 @@ import java.util.List;
 public class ProjectCreditBalanceQuery implements Query {
 
     @ApiModelProperty("项目sid")
-    private String projectSid; // 项目sid
+    private String projectsid; // 项目sid
     @ApiModelProperty("填报日期结束")
     private String tbdateend; // 填报日期结束
     @ApiModelProperty("填报日期开始")
@@ -63,5 +63,6 @@ public class ProjectCreditBalanceQuery implements Query {
     private String money; // 金额
     private String userSid;
     private List<String> projectsids;
+    private String lx;//1 整个企业下所有的
 
 }
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceMapper.xml
index 7309f064..79328a29 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceMapper.xml
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceMapper.xml
@@ -4,7 +4,7 @@
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.supervise.crm.api.projectcreditbalance.ProjectCreditBalanceVo">
-		SELECT * FROM project_credit_balance <where> ${ew.sqlSegment} </where>
+		SELECT a.* FROM project_credit_balance a left join  enterprise_project b on b.projectSid =a.projectSid<where> ${ew.sqlSegment} </where>
 	</select>
 	
 	<select id="selectListAllVo" resultType="com.yxt.supervise.crm.api.projectcreditbalance.ProjectCreditBalanceVo">
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceService.java
index bc29056c..87bbeec8 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceService.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceService.java
@@ -30,9 +30,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo;
 import com.yxt.supervise.crm.api.projectcreditbalance.*;
 import com.yxt.supervise.crm.api.projectcreditfile.ProjectCreditFile;
 import com.yxt.supervise.crm.api.projectcreditfile.ProjectCreditFileDto;
+import com.yxt.supervise.crm.biz.enterpriseproject.EnterpriseProjectService;
 import com.yxt.supervise.crm.biz.projectcreditfile.ProjectCreditFileService;
 import com.yxt.supervise.crm.biz.projectinformation.ProjectInfoVo;
 import com.yxt.supervise.crm.biz.projectinformation.ProjectInformation;
@@ -74,19 +76,28 @@ public class ProjectCreditBalanceService extends MybatisBaseService<ProjectCredi
 	private ProjectInformationService projectInformationService;
 	@Autowired
 	private FileUploadComponent fileUploadComponent;
+	@Autowired
+	EnterpriseProjectService enterpriseProjectService;
 	private QueryWrapper<ProjectCreditBalance> createQueryWrapper(ProjectCreditBalanceQuery query) {
 		// todo: 这里根据具体业务调整查询条件
 		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
 		QueryWrapper<ProjectCreditBalance> qw = new QueryWrapper<>();
-		qw.eq("isDelete",0);
-		if(StringUtils.isNotBlank(query.getProjectSid())){
-			qw.eq("projectsid",query.getProjectsids());
+		qw.eq("a.isDelete",0);
+		if(StringUtils.isNotBlank(query.getProjectsid())){
+			if(query.getLx().equals("1")){
+				List<EnterpriseProjectVo> list=enterpriseProjectService.getEnterpriseByProjectSid(query.getProjectsid());
+				if(list.size()!=0) {
+					qw.eq("b.enterpriseSid", list.get(0).getEnterpriseSid());
+				}
+			}else{
+				qw.eq("a.projectsid",query.getProjectsid());
+			}
 		}
 		if(StringUtils.isNotBlank(query.getTbdateend())){
-			qw.le("tbdate",query.getTbdateend());
+			qw.le("a.tbdate",query.getTbdateend());
 		}
 		if(StringUtils.isNotBlank(query.getTbdatestart())){
-			qw.ge("tbdate",query.getTbdatestart());
+			qw.ge("a.tbdate",query.getTbdatestart());
 		}
 		//TODO 项目信息的限制
 //		List<ProjectInformationVo> projectByUserSid = projectInformationService.getProjectByUserSid(query.getUserSid());
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectshgm/ProjectShGmService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectshgm/ProjectShGmService.java
index 624767e5..21db26d1 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectshgm/ProjectShGmService.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectshgm/ProjectShGmService.java
@@ -53,6 +53,7 @@ public class ProjectShGmService extends MybatisBaseService<ProjectShGmMapper, Pr
      */
     public ResultBean saveProjectShGm(ProjectShGmDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        baseMapper.delete(new QueryWrapper<ProjectShGm>().like("orderDate",dto.getOrderDate()));
         ProjectShGm entity=new ProjectShGm();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         baseMapper.insert(entity);
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterQuery.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterQuery.java
index 06540efa..42304e67 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterQuery.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterQuery.java
@@ -15,6 +15,7 @@ public class DataCenterQuery implements Query {
     private String intervalTime="7";
     //
     private String projectSid;
+    private String nodeValue;// 在途 在建 竣工
 
 
 
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 26839f77..280e6468 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
@@ -26,6 +26,7 @@ import com.yxt.supervise.report.feign.crm.projectcreditbalance.ProjectCreditBala
 import com.yxt.supervise.report.feign.crm.projectcreditfile.ProjectCreditFileFeign;
 import com.yxt.supervise.report.feign.crm.projectphaserecord.ProjectPhaseRecordFeign;
 import com.yxt.supervise.report.feign.crm.projectshgm.ProjectShGmDto;
+import com.yxt.supervise.report.feign.crm.projectshgm.ProjectShGmFeign;
 import com.yxt.supervise.report.feign.monitor.YDeviceFeign;
 import com.yxt.supervise.report.feign.monitor.YDeviceImageFeign;
 import com.yxt.supervise.report.shanhai.ShRequester;
@@ -67,6 +68,8 @@ public class DataCenterRest {
     private ProjectCreditBalanceFeign projectCreditBalanceFeign;
     @Autowired
     private ProjectCreditFileFeign projectCreditFileFeign;
+    @Autowired
+    private ProjectShGmFeign projectShGmFeign;
 
     //数据总览
     /*********************************************36524演示************************************/
@@ -492,8 +495,8 @@ public class DataCenterRest {
         List<String> title=new ArrayList<>();
         title.add("贷款支持-折");
         title.add("贷款支持-柱");
-        title.add("总贷款-折");
-        title.add("总贷款-柱");
+        title.add("总投资-折");
+        title.add("总投资-柱");
         map.put("titile",title);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         String EndDate=sdf.format(DateUtil.offsetMonth(DateUtil.parse(query.getDate()),-7));
@@ -507,7 +510,8 @@ public class DataCenterRest {
             SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM");
 //            String date=sdf1.format(DateUtil.offsetMonth(DateUtil.parse(query.getDate()),-k));
             String date=sdf1.format(DateUtil.offsetMonth(DateUtil.parse(EndDate),k));
-            a.add(date);
+            int date1=DateUtil.month(DateUtil.offsetMonth(DateUtil.parseDate(EndDate),k))+1;
+            a.add(String.valueOf(date1)+"月");
             ShGmVo vo=crmMapper.getGm(date);
             if(null!=vo){
                 dkzcCount.add(vo.getDkzcCount().toString());
@@ -528,6 +532,7 @@ public class DataCenterRest {
         map.put("ztzCount",ztzCount);
         return rb.success().setData(map);
     }
+
     @ApiOperation("项目分页列表")
     @PostMapping("/getProjectPageList")
     public Object getProjectPageList(@RequestBody PagerQuery<IndexQuery> pq){
@@ -570,6 +575,9 @@ public class DataCenterRest {
         if(StringUtils.isNotBlank(query.getWarehouseCode())){
             sendBody.put("warehouseCode",query.getWarehouseCode());
         }
+        if(StringUtils.isNotBlank(query.getBelongingPlace())){
+            sendBody.put("belongingPlace",query.getBelongingPlace());
+        }
         sendBodyMM.put("params",sendBody);
 //        List<ProjectDetailsVo> projectDetailsVos=c.getListPage(new RestTemplate().postForEntity(a, sendBodyMM, String.class),ProjectDetailsVo.class);
         JSONObject jsonObject=com.alibaba.fastjson.JSONObject.parseObject(new RestTemplate().postForEntity(a, sendBodyMM, String.class).getBody());
@@ -659,14 +667,20 @@ public class DataCenterRest {
 
     @ApiOperation("dingshi")
     @GetMapping("/rr")
-    @Scheduled(cron = "0 0 0 1 * ? ")
+    @Scheduled(cron = "1 0 0 * * ? ")
     public void rr(){
         //山海系统
         String a ="63_17_0_2069_1,63_17_0_2048_1,63_17_0_2049_1,63_17_0_2070_1,63_17_0_2073_1,63_17_0_2075_1,63_17_0_2078_1,63_17_0_2080_1,63_17_0_2087_1,63_17_0_2090_1";
+        List<String> list=new ArrayList<>();
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+        String format = sdf.format(new Date());
+        list.add("2000-01-01");
+        list.add(format);
         IndexQuery query =new IndexQuery();
         query.setPage("1");
         query.setLimit("1000");
         query.setOrder_type("10");
+        query.setSearch_time(list.stream().toArray(String []::new));
         BigDecimal ztz=new BigDecimal(0);
         Integer ztzCount =0;
         for (String s : a.split(",")) {
@@ -695,7 +709,10 @@ public class DataCenterRest {
         A d=new A();
         String url ="https://wms.yxtsoft.com/apiv1/external/apiadmin/warehouseinfo/list";
         RestTemplate restTemplate = new RestTemplate();
-        ResponseEntity<String> forEntity = restTemplate.getForEntity(url,String.class);
+        Map<String, Object> sendBodyMM = new HashMap<>();
+        sendBodyMM.put("engTime",format);
+        sendBodyMM.put("orgPath","0d19bc72-9370-45d3-bfda-5662eab34e4b");
+        ResponseEntity<String> forEntity = restTemplate.postForEntity(url,sendBodyMM,String.class);
         List<ProjectDetailsVo> vos= d.getList(forEntity,ProjectDetailsVo.class);
         BigDecimal dkzc=new BigDecimal(0);
         Integer dkzcCount =0;
@@ -730,31 +747,143 @@ public class DataCenterRest {
         dto.setZtzCount(ztzCount);
         dto.setOrderDate(new Date());
         dto.setEnterpriseSid("0d19bc72-9370-45d3-bfda-5662eab34e4b");
+        projectShGmFeign.save(dto);
     }
 
+    @ApiOperation("dingshi")
+    @GetMapping("/rr1")
+    public void rr(@RequestParam("orderDate")String orderDate){
+        //山海系统
+        String a ="63_17_0_2069_1,63_17_0_2048_1,63_17_0_2049_1,63_17_0_2070_1,63_17_0_2073_1,63_17_0_2075_1,63_17_0_2078_1,63_17_0_2080_1,63_17_0_2087_1,63_17_0_2090_1";
+        List<String> list=new ArrayList<>();
+//        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+//        String format = sdf.format(new Date());
+        list.add("2000-01-01");
+        list.add(orderDate);
+        IndexQuery query =new IndexQuery();
+        query.setPage("1");
+        query.setLimit("1000");
+        query.setOrder_type("10");
+        query.setSearch_time(list.stream().toArray(String []::new));
+        BigDecimal ztz=new BigDecimal(0);
+        Integer ztzCount =0;
+        for (String s : a.split(",")) {
+            query.setWorkflow(s);
+            BaseResponse<BaseResponseListObj<OrderIndexVo>> vos=ShRequester.getsystem$order$index(query);
+            List<OrderIndexVo > c =vos.getData().getList();
+            for (OrderIndexVo orderIndexVo : c) {
+                String d="";
+                if(orderIndexVo.getAll_power().substring(orderIndexVo.getAll_power().length()-2).equals("MW")){
+                    d =orderIndexVo.getAll_power().replace("MW","");
+                    BigDecimal bigDecimal=new BigDecimal(d);
+                    bigDecimal=bigDecimal.multiply(new BigDecimal(1000000));
+                    bigDecimal=bigDecimal.multiply(new BigDecimal(3));
+                    ztz=ztz.add(bigDecimal);
+                }else if(orderIndexVo.getAll_power().substring(orderIndexVo.getAll_power().length()-2).equals("KW")){
+                    d =orderIndexVo.getAll_power().replace("KW","");
+                    BigDecimal bigDecimal=new BigDecimal(d);
+                    bigDecimal=bigDecimal.multiply(new BigDecimal(1000));
+                    bigDecimal=bigDecimal.multiply(new BigDecimal(3));
+                    ztz=ztz.add(bigDecimal);
+                }
+            }
+            ztzCount=ztzCount+vos.getData().getCount();
+        }
+        //商享通
+        A d=new A();
+        String url ="https://wms.yxtsoft.com/apiv1/external/apiadmin/warehouseinfo/list";
+        RestTemplate restTemplate = new RestTemplate();
+        Map<String, Object> sendBodyMM = new HashMap<>();
+        sendBodyMM.put("engTime",orderDate);
+        ResponseEntity<String> forEntity = restTemplate.postForEntity(url,sendBodyMM,String.class);
+        List<ProjectDetailsVo> vos= d.getList(forEntity,ProjectDetailsVo.class);
+        BigDecimal dkzc=new BigDecimal(0);
+        Integer dkzcCount =0;
+        for (ProjectDetailsVo orderIndexVo : vos) {
+            String g="";
+            if(orderIndexVo.getSquareMeter().substring(orderIndexVo.getSquareMeter().length()-2).equals("MW")){
+                g =orderIndexVo.getSquareMeter().replace("MW","");
+                BigDecimal bigDecimal=new BigDecimal(g);
+                bigDecimal=bigDecimal.multiply(new BigDecimal(1000000));
+                bigDecimal=bigDecimal.multiply(new BigDecimal(1));
+                dkzc=dkzc.add(bigDecimal);
+            }else if(orderIndexVo.getSquareMeter().substring(orderIndexVo.getSquareMeter().length()-2).equals("KW")){
+                g =orderIndexVo.getSquareMeter().replace("KW","");
+                BigDecimal bigDecimal=new BigDecimal(g);
+                bigDecimal=bigDecimal.multiply(new BigDecimal(1000));
+                bigDecimal=bigDecimal.multiply(new BigDecimal(1));
+                dkzc=dkzc.add(bigDecimal);
+            }else{
+//                g =orderIndexVo.getSquareMeter().replace("MW","");
+                BigDecimal bigDecimal=new BigDecimal(g);
+                bigDecimal=bigDecimal.multiply(new BigDecimal(1000000));
+                bigDecimal=bigDecimal.multiply(new BigDecimal(1));
+                dkzc=dkzc.add(bigDecimal);
+            }
+        }
 
+        dkzcCount=dkzcCount+vos.size();
+        ProjectShGmDto dto=new ProjectShGmDto();
+        dto.setDkzc(dkzc);
+        dto.setZtz(ztz);
+        dto.setDkzcCount(dkzcCount);
+        dto.setZtzCount(ztzCount);
+        dto.setOrderDate(DateUtil.parse(orderDate));
+        dto.setEnterpriseSid("0d19bc72-9370-45d3-bfda-5662eab34e4b");
+        projectShGmFeign.save(dto);
+    }
     @ApiOperation("获取客户")
     @PostMapping("/getSuppliserInfo")
-    public ResultBean getSuppliserInfo(@RequestBody DataCenterQuery query){
+    public Object getSuppliserInfo(@RequestBody PagerQuery<DataCenterQuery> pq){
         ResultBean rb=new ResultBean();
         A c =new A();
+        List<ProjectInfo> projectInfo=crmMapper.getEnterByProjetSid(pq.getParams().getProjectSid());
+        Map<String,Object> sendBodyMM=new HashMap<>();
+        Map<String, Object> sendBody = new HashMap<>();
+        sendBodyMM.put("current",pq.getCurrent());
+        sendBodyMM.put("size",pq.getSize());
+        sendBody.put("orgPath",projectInfo.get(0).getEnterpriseSid());
+        sendBodyMM.put("params",sendBody);
         RestTemplate restTemplate = new RestTemplate();
-        List<ProjectInfo> projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid());
-        ResponseEntity<String> forEntity1 = restTemplate.getForEntity("https://wms.yxtsoft.com/apiv1/external/apiadmin/supplierinfo/getSupplierCountByOrgSid?orgSid="+projectInfo.get(0).getEnterpriseSid(),String.class);
+        ResponseEntity<String> forEntity1 = restTemplate.postForEntity("https://wms.yxtsoft.com/apiv1/external/apiadmin/supplierinfo/listPage1",sendBodyMM,String.class);
         //        ResponseEntity<String> forEntity1 = restTemplate.getForEntity("http://192.168.0.105:6023/apiadmin/supplierinfo/getSupplierCountByOrgSid?orgSid="+projectInfo.get(0).getEnterpriseSid(),String.class);
-        List<SupplierInfoVo> supplierInfoVo = c.getList(forEntity1, SupplierInfoVo.class);
-        return rb.success().setData(supplierInfoVo);
+//        List<SupplierInfoVo> supplierInfoVo = c.getList(forEntity1, SupplierInfoVo.class);
+        return forEntity1.getBody();
     }
     @ApiOperation("获取供应商")
     @PostMapping("/getCustomerInfo")
-    public ResultBean getCustomerInfo(@RequestBody DataCenterQuery query){
+    public Object getCustomerInfo(@RequestBody PagerQuery<DataCenterQuery> pq){
         ResultBean rb=new ResultBean();
         A c =new A();
         RestTemplate restTemplate = new RestTemplate();
-        List<ProjectInfo> projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid());
-        ResponseEntity<String> forEntity = restTemplate.getForEntity("https://wms.yxtsoft.com/apiv1/external/v1/crmcustomertemp/getCustomerByOrgSid?orgSid="+projectInfo.get(0).getEnterpriseSid(),String.class);
+        List<ProjectInfo> projectInfo=crmMapper.getEnterByProjetSid(pq.getParams().getProjectSid());
+        Map<String,Object> sendBodyMM=new HashMap<>();
+        Map<String, Object> sendBody = new HashMap<>();
+        sendBodyMM.put("current",pq.getCurrent());
+        sendBodyMM.put("size",pq.getSize());
+        sendBody.put("orgPath",projectInfo.get(0).getEnterpriseSid());
+        sendBodyMM.put("params",sendBody);
+        ResponseEntity<String> forEntity = restTemplate.postForEntity("https://wms.yxtsoft.com/apiv1/external/v1/crmcustomertemp/listPage1",sendBodyMM,String.class);
         //        ResponseEntity<String> forEntity1 = restTemplate.getForEntity("http://192.168.0.105:6023/apiadmin/supplierinfo/getSupplierCountByOrgSid?orgSid="+projectInfo.get(0).getEnterpriseSid(),String.class);
-        List<CrmCustomerTempVo> jsonObject = c.getList(forEntity,CrmCustomerTempVo.class);
-        return rb.success().setData(jsonObject);
+//        List<CrmCustomerTempVo> jsonObject = c.getList(forEntity,CrmCustomerTempVo.class);
+        System.out.println(forEntity);
+        return forEntity.getBody();
+    }
+    @ApiOperation("项目报告")
+    @PostMapping("/getProjectReportByNode")
+    public ResultBean getProjectReportByNode(@RequestBody  PagerQuery<DataCenterQuery> pq){
+        ResultBean rb=new ResultBean();
+        DataCenterQuery query=pq.getParams();
+        QueryWrapper<ProjectRecordVo> qw = new QueryWrapper<>();
+        Map<String,Object> map=new HashMap<>();
+//        ProjectInfo projectInfo=crmMapper.getProject(query.getProjectSid());
+        List<ProjectInfo> projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid());
+        qw.eq("a.enterpriseSid",projectInfo.get(0).getEnterpriseSid());
+        qw.eq("d.nodeValue",query.getNodeValue());
+        qw.apply("url is not null");
+        IPage<ProjectRecordVo> page = PagerUtil.queryToPage(pq);
+        IPage<ProjectRecordVo> pagging = crmMapper.getPhaseFiles(page, qw);
+
+        return rb.success().setData(pagging);
     }
 }
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 a2198644..2e2b2026 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
@@ -2,6 +2,7 @@ package com.yxt.supervise.report.ds.crm;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
@@ -167,6 +168,8 @@ public interface CrmMapper extends BaseMapper<ProjectInfo> {
             "WHERE\n" +
             "\ta.enterpriseSid = #{enterpriseSid} and url is not NULL")
     List<ProjectRecordVo> getPhaseFilesByEnterpriseSid(@Param("enterpriseSid") String enterpriseSid);
+
+    IPage<ProjectRecordVo> getPhaseFiles(IPage<ProjectRecordVo> page,@Param(Constants.WRAPPER) QueryWrapper<ProjectRecordVo> qw);
     @Select({
             "<script>",
             "select",
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.xml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.xml
index 80f6bf95..e0ffa013 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.xml
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.xml
@@ -17,4 +17,21 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="getPhaseFiles" resultType="com.yxt.supervise.report.ds.crm.ProjectRecordVo">
+        SELECT
+        c.createTime,
+        c.absolutePath,
+        c.url,
+        c.name,
+        b.entryName,
+        d.nodeValue
+        FROM
+        enterprise_project as a
+        LEFT JOIN project_information b ON b.sid = a.projectSid
+        left join project_files c on c.mainSid=b.sid
+        left join project_phase d on d.projectSid =b.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectRecordVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectRecordVo.java
index bcd5b6b2..0624b29b 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectRecordVo.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectRecordVo.java
@@ -17,5 +17,6 @@ public class ProjectRecordVo {
     private String url;
     private String name;
     private String entryName;
+    private String nodeValue;
 
 }
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceQuery.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceQuery.java
index 195b6bb9..d7aa1ef2 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceQuery.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceQuery.java
@@ -51,7 +51,7 @@ import java.util.List;
 public class ProjectCreditBalanceQuery implements Query {
 
     @ApiModelProperty("项目sid")
-    private String projectSid; // 项目sid
+    private String projectsid; // 项目sid
     @ApiModelProperty("填报日期结束")
     private String tbdateend; // 填报日期结束
     @ApiModelProperty("填报日期开始")
@@ -62,5 +62,6 @@ public class ProjectCreditBalanceQuery implements Query {
     private String money; // 金额
     private String userSid;
     private List<String> projectsids;
+    private String lx;//1 整个企业下所有的
 
 }
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/req/IndexQuery.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/req/IndexQuery.java
index ef9a8e20..edf5e9c0 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/req/IndexQuery.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/req/IndexQuery.java
@@ -25,4 +25,6 @@ public class IndexQuery implements Query {
     private String creditNature;
 //    ------------------------------------
     private String search_no;
+    private String belongingPlace;
+    private String [] search_time;
 }