diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectengineeringprogress/ProjectEngineeringProgress.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectengineeringprogress/ProjectEngineeringProgress.java
new file mode 100644
index 00000000..8568171f
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectengineeringprogress/ProjectEngineeringProgress.java
@@ -0,0 +1,19 @@
+package com.yxt.supervise.crm.api.projectengineeringprogress;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+@ApiModel(value = "项目阶段 ", description = "项目阶段")
+@TableName("project_phase")
+public class ProjectEngineeringProgress extends BaseEntity {
+    private String projectSid;
+    private String nodeKey;
+    private String nodeValue;
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectengineeringprogress/ProjectEngineeringProgressDto.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectengineeringprogress/ProjectEngineeringProgressDto.java
new file mode 100644
index 00000000..9db5601d
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectengineeringprogress/ProjectEngineeringProgressDto.java
@@ -0,0 +1,16 @@
+package com.yxt.supervise.crm.api.projectengineeringprogress;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class ProjectEngineeringProgressDto implements Dto {
+    private String sid;
+    private String projectSid;
+    private String nodeKey;
+    private String nodeValue;
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectengineeringprogress/ProjectEngineeringProgressQuery.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectengineeringprogress/ProjectEngineeringProgressQuery.java
new file mode 100644
index 00000000..39941725
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectengineeringprogress/ProjectEngineeringProgressQuery.java
@@ -0,0 +1,16 @@
+package com.yxt.supervise.crm.api.projectengineeringprogress;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class ProjectEngineeringProgressQuery implements Query {
+    private String id;
+    private String sid;
+    private String shSid;
+    private String projectSid;
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectengineeringprogress/ProjectEngineeringProgressVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectengineeringprogress/ProjectEngineeringProgressVo.java
new file mode 100644
index 00000000..d0b9ee2c
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectengineeringprogress/ProjectEngineeringProgressVo.java
@@ -0,0 +1,15 @@
+package com.yxt.supervise.crm.api.projectengineeringprogress;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class ProjectEngineeringProgressVo implements Vo {
+    private String projectSid;
+    private String orderDate;
+    private String progressDescription;
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectengineeringprogress/ProjectEngineeringProgressMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectengineeringprogress/ProjectEngineeringProgressMapper.java
new file mode 100644
index 00000000..ade97136
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectengineeringprogress/ProjectEngineeringProgressMapper.java
@@ -0,0 +1,23 @@
+package com.yxt.supervise.crm.biz.projectengineeringprogress;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.crm.api.projectengineeringprogress.ProjectEngineeringProgress;
+import com.yxt.supervise.crm.api.projectengineeringprogress.ProjectEngineeringProgressVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/23 11:49
+ */
+@Mapper
+public interface ProjectEngineeringProgressMapper extends BaseMapper<ProjectEngineeringProgress> {
+    IPage<ProjectEngineeringProgressVo> selectPageVo(IPage<ProjectEngineeringProgress> page, @Param(Constants.WRAPPER) Wrapper<ProjectEngineeringProgress> qw);
+    List<ProjectEngineeringProgressVo> getNodeByEnterpriseSid(@Param("enterpriseSid") String enterpriseSid);
+
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectengineeringprogress/ProjectEngineeringProgressMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectengineeringprogress/ProjectEngineeringProgressMapper.xml
new file mode 100644
index 00000000..24e4e546
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectengineeringprogress/ProjectEngineeringProgressMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.supervise.crm.biz.projectengineeringprogress.ProjectEngineeringProgressMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.crm.api.projectphase.ProjectPhaseVo">
+        SELECT cct.*
+        FROM project_phase cct
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="getNodeByEnterpriseSid" resultType="com.yxt.supervise.crm.api.projectphase.ProjectPhaseVo">
+        select * from project_phase_dictionary where enterpriseSid=#{enterpriseSid}
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectengineeringprogress/ProjectEngineeringProgressRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectengineeringprogress/ProjectEngineeringProgressRest.java
new file mode 100644
index 00000000..dcbaf688
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectengineeringprogress/ProjectEngineeringProgressRest.java
@@ -0,0 +1,78 @@
+package com.yxt.supervise.crm.biz.projectengineeringprogress;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.crm.api.projectengineeringprogress.ProjectEngineeringProgressDto;
+import com.yxt.supervise.crm.api.projectengineeringprogress.ProjectEngineeringProgressQuery;
+import com.yxt.supervise.crm.api.projectengineeringprogress.ProjectEngineeringProgressVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/23 11:49
+ */
+@Api(tags = "银行负责人信息")
+@RestController
+@RequestMapping("v1/ProjectEngineeringProgress")
+public class ProjectEngineeringProgressRest {
+
+    @Autowired
+    private ProjectEngineeringProgressService projectEngineeringProgressService;
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<ProjectEngineeringProgressVo>> listPage(@RequestBody PagerQuery<ProjectEngineeringProgressQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ProjectEngineeringProgressVo> pv = projectEngineeringProgressService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+
+    @ApiOperation("保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody ProjectEngineeringProgressDto dto) {
+        return projectEngineeringProgressService.saveProjectEngineeringProgress(dto);
+    }
+
+//    @ApiOperation("修改")
+//    @PostMapping("/update")
+//    public ResultBean update(@RequestBody ProjectEngineeringProgressDto dto) {
+//        ResultBean rb = ResultBean.fireFail();
+//
+//        ResultBean resultBean = ProjectEngineeringProgressService.updateProjectEngineeringProgress(dto);
+//        if (!resultBean.getSuccess()) {
+//            return rb.setMsg(resultBean.getMsg());
+//        }
+//        return rb.success().setMsg(resultBean.getMsg());
+//    }
+
+    @ApiOperation("删除")
+    @DeleteMapping("/delete")
+    public ResultBean del(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        projectEngineeringProgressService.delBySids(sids);
+        return rb.success();
+    }
+    @ApiOperation("根据sid查询")
+    @GetMapping("/getManagerBySid/{sid}")
+    public ResultBean<ProjectEngineeringProgressVo> getManagerBySid(@PathVariable String sid) {
+        ResultBean<ProjectEngineeringProgressVo> rb = ResultBean.fireFail();
+        ProjectEngineeringProgressVo vo = projectEngineeringProgressService.getManagerBySid(sid);
+        if (vo == null) {
+            return rb.setMsg("该银行联系人不存在");
+        }
+        return rb.success().setData(vo);
+    }
+    @ApiOperation("根据sid查询")
+    @GetMapping("/getNodeByProjectSid")
+    public ResultBean<List<ProjectEngineeringProgressVo>> getNodeByProjectSid(@RequestParam("projectSid") String projectSid) {
+        return projectEngineeringProgressService.getNodeByProjectSid(projectSid);
+    }
+
+
+}
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectengineeringprogress/ProjectEngineeringProgressService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectengineeringprogress/ProjectEngineeringProgressService.java
new file mode 100644
index 00000000..20f86446
--- /dev/null
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectengineeringprogress/ProjectEngineeringProgressService.java
@@ -0,0 +1,89 @@
+package com.yxt.supervise.crm.biz.projectengineeringprogress;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo;
+import com.yxt.supervise.crm.api.projectengineeringprogress.ProjectEngineeringProgress;
+import com.yxt.supervise.crm.api.projectengineeringprogress.ProjectEngineeringProgressDto;
+import com.yxt.supervise.crm.api.projectengineeringprogress.ProjectEngineeringProgressQuery;
+import com.yxt.supervise.crm.api.projectengineeringprogress.ProjectEngineeringProgressVo;
+import com.yxt.supervise.crm.biz.enterpriseproject.EnterpriseProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/23 11:49
+ */
+@Service
+public class ProjectEngineeringProgressService extends MybatisBaseService<ProjectEngineeringProgressMapper, ProjectEngineeringProgress> {
+    @Autowired
+    com.yxt.supervise.crm.feign.system.SysUserFeign sysUserFeign;
+    @Autowired
+    EnterpriseProjectService enterpriseProjectService;
+
+    public PagerVo<ProjectEngineeringProgressVo> listPageVo(PagerQuery<ProjectEngineeringProgressQuery> pq) {
+        ProjectEngineeringProgressQuery query = pq.getParams();
+        QueryWrapper<ProjectEngineeringProgress> qw = new QueryWrapper<>();
+//        if(StringUtils.isNotBlank(query.getEnterpriseName())){
+//            qw.like("enterpriseName",query.getEnterpriseName());
+//        }
+//        if(StringUtils.isNotBlank(query.getTelephone())){
+//            qw.like("telephone",query.getTelephone());
+//        }
+        IPage<ProjectEngineeringProgress> page = PagerUtil.queryToPage(pq);
+        IPage<ProjectEngineeringProgressVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<ProjectEngineeringProgressVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+
+    /**
+     * 新增
+     * @param dto 数据传输对象
+     * @return
+     */
+    public ResultBean saveProjectEngineeringProgress(ProjectEngineeringProgressDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        ProjectEngineeringProgress entity=new ProjectEngineeringProgress();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+        return rb.success();
+    }
+
+
+    /**
+     * 编辑保存银行负责人
+     * @param dto 数据传输对象
+     * @return
+     */
+    public ResultBean updateProjectEngineeringProgress(ProjectEngineeringProgressDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String dtoSid = dto.getSid();
+        ProjectEngineeringProgress entity=fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+        return rb.success().setMsg("更新成功");
+    }
+
+    public ProjectEngineeringProgressVo getManagerBySid(String sid) {
+        ProjectEngineeringProgressVo vo = new ProjectEngineeringProgressVo();
+        ProjectEngineeringProgress ProjectEngineeringProgress = this.fetchBySid(sid);
+        BeanUtil.copyProperties(ProjectEngineeringProgress, vo);
+        return vo;
+    }
+    public ResultBean<List<ProjectEngineeringProgressVo>> getNodeByProjectSid(String projectSid) {
+        ResultBean rb =new ResultBean().fail();
+        List<EnterpriseProjectVo> list=enterpriseProjectService.getEnterpriseByProjectSid(projectSid);
+        List<ProjectEngineeringProgressVo> ProjectEngineeringProgressVoList=baseMapper.getNodeByEnterpriseSid(list.get(0).getEnterpriseSid());
+        return rb.success().setData(ProjectEngineeringProgressVoList);
+    }
+}
\ No newline at end of file
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 51c77292..e4dbfd97 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
@@ -182,42 +182,61 @@ public class DataCenterRest {
         ResultBean rb = ResultBean.fireFail();
         return reportInventoryDayGatherService.getProjectBySid(projectSid);
     }
-
+    //@Todo  山海光伏大屏数据接口
     @ApiOperation("获取仓库地址及经纬度")
     @PostMapping("/getWarehouseAddress")
-    public Object getWarehouseAddress(@RequestBody WarehouseInfoMapQuery query){
-        String a ="https://wms.yxtsoft.com/apiv1/external/apiadmin/warehouseinfo/list";
+    public ResultBean getWarehouseAddress(@RequestBody WarehouseInfoMapQuery query){
+        ResultBean rb= new ResultBean().fail();
+        A c=new A();
+//        String a ="https://wms.yxtsoft.com/apiv1/external/apiadmin/warehouseinfo/list";
+        String a ="http://192.168.0.105:6023/apiadmin/warehouseinfo/list";
         Map<String, Object> sendBodyMM = new HashMap<>();
         if(StringUtils.isNotBlank(query.getName())){
             sendBodyMM.put("name",query.getName());
         }
         List<ProjectInfo> projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid());
         sendBodyMM.put("orgPath",projectInfo.get(0).getEnterpriseSid());
-        RestTemplate restTemplate = new RestTemplate();
-        ResponseEntity<String> forEntity = restTemplate.postForEntity(a, sendBodyMM, String.class);
-        com.alibaba.fastjson.JSONObject jsonObject=new com.alibaba.fastjson.JSONObject();
-        jsonObject = com.alibaba.fastjson.JSONObject.parseObject(forEntity.getBody());
-//        String b=jsonObject.get("date");
-        return jsonObject;
+        List<ProjectDetailsVo> projectDetailsVos=c.getList(new RestTemplate().postForEntity(a, sendBodyMM, String.class),ProjectDetailsVo.class);
+        for (ProjectDetailsVo projectDetailsVo : projectDetailsVos) {
+            ProjectInfo info= crmMapper.getProjectByShSid(projectDetailsVo.getSid());
+            if(null!=info){
+                List<ShCreditBalanceCrmVo> vos=crmMapper.getBalanceByProjectSid(info.getProjectSid());
+                for (ShCreditBalanceCrmVo vo : vos) {
+                    if(vo.getType().equals("1")){
+                        projectDetailsVo.setExpectedCompletionDate(vo.getExpectedCompletionDate());
+                        projectDetailsVo.setExpectedDeliveryDate(vo.getExpectedDeliveryDate());
+                        projectDetailsVo.setCreditStage(vo.getCreditStage());
+                        projectDetailsVo.setCreditNature(vo.getCreditNature());
+                        projectDetailsVo.setMoney(projectDetailsVo.getMoney().add(vo.getMoney()));
+                    }else{
+                        projectDetailsVo.setHkMoney(projectDetailsVo.getMoney().add(vo.getMoney()));
+                    }
+                }
+                List<ProjectEngineeringProgressVo> vos1=crmMapper.getEngineeringByProject(info.getProjectSid());
+                projectDetailsVo.setProjectEngineeringList(vos1);
+                List<ProjectSupervisionLogVo> vo33=crmMapper.getLogByProject(info.getProjectSid());
+                projectDetailsVo.setProjectSupervisionLogList(vo33);
+            }
+
+        }
+        return rb.success().setData(projectDetailsVos);
     }
 
 
 
-    //@Todo  山海光伏大屏数据接口
 
     @ApiOperation("项目概况")
     @PostMapping("/projectOverview")
     public ResultBean<ShDateCenterVo> projectOverview(@RequestBody DataCenterQuery query){
         ResultBean rb=new ResultBean();
+        A c=new A();
         ShDateCenterVo shDateCenterVo=new ShDateCenterVo();
         List<ProjectInfo> 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<String> forEntity = restTemplate.getForEntity(a1,String.class);
-        ResponseEntity<String> forEntity1 = restTemplate.getForEntity(b2,String.class);
-        Integer jsonObject = JSONObject.parseObject(forEntity.getBody()).getInteger("data");
-        Integer jsonObject1 = JSONObject.parseObject(forEntity1.getBody()).getInteger("data");
+        ResponseEntity<String> forEntity = restTemplate.getForEntity("https://wms.yxtsoft.com/apiv1/external/v1/crmcustomertemp/getCustomerByOrgSid?orgSid="+projectInfo.get(0).getEnterpriseSid(),String.class);
+        ResponseEntity<String> forEntity1 = restTemplate.getForEntity("https://wms.yxtsoft.com/apiv1/external/apiadmin/supplierinfo/getSupplierCountByOrgSid?orgSid="+projectInfo.get(0).getEnterpriseSid(),String.class);
+        Integer jsonObject = c.getInteger(forEntity);
+        Integer jsonObject1 = c.getInteger(forEntity1);
         shDateCenterVo.setDownstreamEnterprises(jsonObject);
         shDateCenterVo.setUpstreamEnterprises(jsonObject1);
         List<ProjectInfo> projectInfoList=crmMapper.getProjectcs(projectInfo.get(0).getEnterpriseSid());
@@ -274,14 +293,14 @@ public class DataCenterRest {
     public ResultBean<Map<String,Object>> getEnterpriseInfo(@RequestBody DataCenterQuery query){
         ResultBean rb=new ResultBean();
         Map<String,Object> map=new HashMap<>();
-//        ProjectInfo projectInfo=crmMapper.getProject(query.getProjectSid());
+        A c=new A();
         List<ProjectInfo> projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid());
         List<ProjectInfo> projectInfoLists=crmMapper.getNodeValue(projectInfo.get(0).getEnterpriseSid());
 //        Integer w=crmMapper.getEnterpirseCount(projectInfo.get(0).getEnterpriseSid());
         String a1 ="https://wms.yxtsoft.com/apiv1/external/v1/crmcustomertemp/getCustomerByOrgSid?orgSid="+projectInfo.get(0).getEnterpriseSid();
         RestTemplate restTemplate = new RestTemplate();
         ResponseEntity<String> forEntity = restTemplate.getForEntity(a1,String.class);
-        Integer jsonObject = JSONObject.parseObject(forEntity.getBody()).getInteger("data");
+        Integer jsonObject =c.getInteger(forEntity);
         map.put("loanEnterprise","1");
         map.put("ensureEnterprise",jsonObject);
         map.put("bank","1");
@@ -315,20 +334,15 @@ public class DataCenterRest {
     @PostMapping("/projectOverviewMap")
     public ResultBean<Map<String,Object>> projectOverviewMap(@RequestBody DataCenterQuery query){
         ResultBean rb=new ResultBean();
+        A d=new A();
         Map<String,Object> map=new HashMap<>();
-//        ProjectInfo projectInfo=crmMapper.getProject(query.getProjectSid());
         List<ProjectInfo> projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid());
         List<ProjectInfo> projectInfoList=crmMapper.getProjectcs(projectInfo.get(0).getEnterpriseSid());
         List<ProjectInfo> 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<String> forEntity = restTemplate.getForEntity(a1,String.class);
-        JSONArray jsonArray=com.alibaba.fastjson.JSONObject.parseObject(forEntity.getBody()).getJSONArray("data");
-        List<WarehouseInfoVoSheng> vos=new ArrayList<>();
-        for (int i = 0; i < jsonArray.size(); i++) {
-            WarehouseInfoVoSheng vo= JSON.toJavaObject(jsonArray.getJSONObject(i),WarehouseInfoVoSheng.class);
-            vos.add(vo);
-        }
+        List<WarehouseInfoVoSheng> vos= d.getList(forEntity,WarehouseInfoVoSheng.class);
         int dd=0;
         int zj=0;
         int jg=0;
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
new file mode 100644
index 00000000..38eb332e
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ProjectDetailsVo.java
@@ -0,0 +1,41 @@
+package com.yxt.supervise.report.biz.datacenter;
+
+import com.yxt.supervise.report.ds.crm.ShCreditBalanceCrmVo;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/10/17 15:17
+ */
+@Data
+public class ProjectDetailsVo {
+    private String sid;
+    private String warehouseName;//仓库名称
+    private String warehouseCode;//仓库编码
+    private String contacts;//联系人
+    private String mob;//手机
+    private String telephone;//联系电话
+    private String manager;//主管
+    private String address;//地址
+    private String lngAndLat;//经纬度
+    private String longitude;//经度
+    private String latitude;//纬度
+    private String squareMeter;//平方米
+    private String supplierName;
+    private String supplierType;
+    private String goodsDetail;
+    private String tbdate;//放款日期
+    private BigDecimal money=new BigDecimal(0);//用信金额
+    private String expectedCompletionDate;//预计完工日期
+    private String expectedDeliveryDate;//预计到货日期
+    private String creditNature;//用信性质
+    private String creditStage;//用信阶段
+    private BigDecimal hkMoney=new BigDecimal(0);
+//    List<ShCreditBalanceCrmVo> creditList =new ArrayList<>();
+    List<ProjectEngineeringProgressVo> projectEngineeringList=new ArrayList<>();
+    List<ProjectSupervisionLogVo> projectSupervisionLogList=new ArrayList<>();
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ProjectEngineeringProgressVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ProjectEngineeringProgressVo.java
new file mode 100644
index 00000000..dc1d7bef
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ProjectEngineeringProgressVo.java
@@ -0,0 +1,15 @@
+package com.yxt.supervise.report.biz.datacenter;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class ProjectEngineeringProgressVo implements Vo {
+    private String projectSid;
+    private String orderDate;//日期
+    private String progressDescription;//进度
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ProjectSupervisionLogVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ProjectSupervisionLogVo.java
new file mode 100644
index 00000000..c34e01ab
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ProjectSupervisionLogVo.java
@@ -0,0 +1,16 @@
+package com.yxt.supervise.report.biz.datacenter;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/10/18 16:11
+ */
+@Data
+public class ProjectSupervisionLogVo {
+    private String projectSid;
+    private String orderDate;//日期
+    private String regulatoryWork;//监管工作
+    private String workArrangement;//下一步工作安排
+    private String remarks;//备注
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfo.java
index 287f4a66..93c1517a 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfo.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfo.java
@@ -16,16 +16,10 @@ public class WarehouseInfo extends BaseEntity {
     private String mob;//手机
     private String telephone;//联系电话
     private String manager;//主管
-    private String areaSid;//地区sid
     private String address;//地址
     private String lngAndLat;//经纬度
     private String longitude;//经度
     private String latitude;//纬度
-    private String warehouseTypeKey;//仓库类型Key
-    private String warehouseTypeValue;//仓库类型value
-    private Integer usageStatus;//使用状态,0停用 1正常
     private String squareMeter;//平方米
-    private Integer sortNo;//排序
-    private String useOrgSid;//创建组织sid
-    private String createOrgSid;//创建组织sid
+
 }
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 d0593e76..eecacf6e 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,8 @@ package com.yxt.supervise.report.ds.crm;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.supervise.report.biz.datacenter.ProjectEngineeringProgressVo;
+import com.yxt.supervise.report.biz.datacenter.ProjectSupervisionLogVo;
 import com.yxt.supervise.report.ds.warehouse.StoreHouse;
 import org.apache.ibatis.annotations.*;
 
@@ -163,4 +165,12 @@ public interface CrmMapper extends BaseMapper<ProjectInfo> {
     List<ProjectRecordVo> getPhaseFilesByEnterpriseSid(@Param("enterpriseSid") String enterpriseSid);
     @Select("select * from enterprise_project where projectSid=#{projectSid}")
     List<ProjectInfo> getEnterByProjetSid(@Param("projectSid") String projectSid);
+    @Select("select * from storehouse_project where shSid=#{shSid}")
+    ProjectInfo getProjectByShSid(@Param("shSid") String shSid);
+    @Select("select type,money ,tbdate ,expectedCompletionDate ,expectedDeliveryDate,creditNature,creditStage from project_credit_balance where projectSid=#{projectSid} and type='1'")
+    List<ShCreditBalanceCrmVo>  getBalanceByProjectSid(@Param("projectSid") String projectSid);
+    @Select("select * from project_engineering_progress where projectSid=#{projectSid}")
+    List<ProjectEngineeringProgressVo> getEngineeringByProject(@Param("projectSid") String projectSid);
+    @Select("select * from project_supervision_log where projectSid=#{projectSid}")
+    List<ProjectSupervisionLogVo> getLogByProject(@Param("projectSid") String projectSid);
 }
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java
index bf95c6fd..03aae4c8 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java
@@ -50,4 +50,6 @@ public class ProjectInfo {
     private String type;
     @TableField(exist = false)
     private String shSid;
+    @TableField(exist = false)
+    private String projectSid;
 }
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ShCreditBalanceCrmVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ShCreditBalanceCrmVo.java
index 74de981a..edd28771 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ShCreditBalanceCrmVo.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ShCreditBalanceCrmVo.java
@@ -12,12 +12,16 @@ import java.math.BigDecimal;
 public class ShCreditBalanceCrmVo {
     private String sid;
     private String type;
-    private String tbdate;
-    private BigDecimal money;
+    private String tbdate;//日期
+    private BigDecimal money;//金额
     private String projectsid;
     private String projectname;
     private String enterpriseSid;
     private String enterpriseName;
+    private String expectedCompletionDate;//预计完工日期
+    private String expectedDeliveryDate;//预计到货日期
+    private String creditNature;//用信性质
+    private String creditStage;//用信阶段
     private String pzfile;