山海数据大屏

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprog/ProjectEnginProg.java

@@ -0,0 +1,23 @@
+package com.yxt.supervise.crm.api.projectenginprog;
+
+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_supervision_log")
+public class ProjectEnginProg extends BaseEntity {
+    private String projectSid;
+    private String logTypeKey;
+    private String logTypeValue;
+    private String logText;
+    private String orderDate;
+    private String regulatoryWork;
+    private String workArrangement;//
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprog/ProjectEnginProgDto.java

@@ -0,0 +1,21 @@
+package com.yxt.supervise.crm.api.projectenginprog;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class ProjectEnginProgDto implements Dto {
+    private String sid;
+    private String projectSid;
+    private String logTypeKey;
+    private String logTypeValue;
+    private String logText;
+    private String orderDate;
+    private String regulatoryWork;
+    private String workArrangement;//
+    private String [] urls;
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprog/ProjectEnginProgQuery.java

@@ -0,0 +1,16 @@
+package com.yxt.supervise.crm.api.projectenginprog;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class ProjectEnginProgQuery implements Query {
+    private String id;
+    private String sid;
+    private String shSid;
+    private String projectSid;
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprog/ProjectEnginProgVo.java

@@ -0,0 +1,19 @@
+package com.yxt.supervise.crm.api.projectenginprog;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class ProjectEnginProgVo implements Vo {
+    private String projectSid;
+    private String logTypeKey;
+    private String logTypeValue;
+    private String logText;
+    private String orderDate;
+    private String regulatoryWork;
+    private String workArrangement;//
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprogfile/ProjectEnginProgFile.java

@@ -0,0 +1,23 @@
+package com.yxt.supervise.crm.api.projectenginprogfile;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+@ApiModel(value = "项目阶段 ", description = "项目阶段")
+@TableName("project_phase")
+public class ProjectEnginProgFile extends BaseEntity {
+    @ApiModelProperty("主表sid")
+    private String mainsid; // 主表sid
+    @ApiModelProperty("项目附件链接")
+    private String url; // 项目附件链接
+    private String absolutePath; // 项目附件链接
+    private String name; // 项目附件链接
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprogfile/ProjectEnginProgFileDto.java

@@ -0,0 +1,26 @@
+package com.yxt.supervise.crm.api.projectenginprogfile;
+
+import com.yxt.common.core.dto.Dto;
+import com.yxt.supervise.crm.api.projectfiles.UrlVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class ProjectEnginProgFileDto implements Dto {
+    private String sid;
+    @ApiModelProperty("主表sid")
+    private String mainsid; // 主表sid
+    @ApiModelProperty("项目附件链接")
+    private String url; // 项目附件链接
+    private String absolutePath; // 项目附件链接
+    private String name; // 项目附件链接
+    List<UrlVo> reportList=new ArrayList<>();
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprogfile/ProjectEnginProgFileQuery.java

@@ -0,0 +1,16 @@
+package com.yxt.supervise.crm.api.projectenginprogfile;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class ProjectEnginProgFileQuery implements Query {
+    private String id;
+    private String sid;
+    private String shSid;
+    private String projectSid;
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprogfile/ProjectEnginProgFileVo.java

@@ -0,0 +1,19 @@
+package com.yxt.supervise.crm.api.projectenginprogfile;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class ProjectEnginProgFileVo implements Vo {
+    @ApiModelProperty("主表sid")
+    private String mainsid; // 主表sid
+    @ApiModelProperty("项目附件链接")
+    private String url; // 项目附件链接
+    private String absolutePath; // 项目附件链接
+    private String name; // 项目附件链接
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprogfile/UrlVo.java

@@ -0,0 +1,16 @@
+package com.yxt.supervise.crm.api.projectenginprogfile;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/9/13 14:19
+ */
+@Data
+public class UrlVo {
+    @ApiModelProperty("项目附件链接")
+    private String url; // 项目附件链接
+    private String absolutePath; // 绝对路径
+    private String fileSrcName; // 绝对路径
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectshgm/ProjectShGm.java

@@ -0,0 +1,22 @@
+package com.yxt.supervise.crm.api.projectshgm;
+
+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_sh_gm")
+public class ProjectShGm extends BaseEntity {
+    private String orderDate;
+    private String ztz;
+    private String ztzCount;
+    private String dkzc;
+    private String dkzcCount;
+    private String enterpriseSid;
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectshgm/ProjectShGmDto.java

@@ -0,0 +1,19 @@
+package com.yxt.supervise.crm.api.projectshgm;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class ProjectShGmDto implements Dto {
+    private String sid;
+    private String orderDate;
+    private String ztz;
+    private String ztzCount;
+    private String dkzc;
+    private String dkzcCount;
+    private String enterpriseSid;
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectshgm/ProjectShGmQuery.java

@@ -0,0 +1,16 @@
+package com.yxt.supervise.crm.api.projectshgm;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class ProjectShGmQuery implements Query {
+    private String id;
+    private String sid;
+    private String shSid;
+    private String projectSid;
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectshgm/ProjectShGmVo.java

@@ -0,0 +1,19 @@
+package com.yxt.supervise.crm.api.projectshgm;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class ProjectShGmVo implements Vo {
+    private String sid;
+    private String orderDate;
+    private String ztz;
+    private String ztzCount;
+    private String dkzc;
+    private String dkzcCount;
+    private String enterpriseSid;
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlog/ProjectSupervisionLog.java

@@ -0,0 +1,23 @@
+package com.yxt.supervise.crm.api.projectsupervisionlog;
+
+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_supervision_log")
+public class ProjectSupervisionLog extends BaseEntity {
+    private String projectSid;
+    private String logTypeKey;
+    private String logTypeValue;
+    private String logText;
+    private String orderDate;
+    private String regulatoryWork;
+    private String workArrangement;//
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlog/ProjectSupervisionLogDto.java

@@ -0,0 +1,21 @@
+package com.yxt.supervise.crm.api.projectsupervisionlog;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class ProjectSupervisionLogDto implements Dto {
+    private String sid;
+    private String projectSid;
+    private String logTypeKey;
+    private String logTypeValue;
+    private String logText;
+    private String orderDate;
+    private String regulatoryWork;
+    private String workArrangement;//
+    private String [] urls;
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlog/ProjectSupervisionLogQuery.java

@@ -0,0 +1,16 @@
+package com.yxt.supervise.crm.api.projectsupervisionlog;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class ProjectSupervisionLogQuery implements Query {
+    private String id;
+    private String sid;
+    private String shSid;
+    private String projectSid;
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlog/ProjectSupervisionLogVo.java

@@ -0,0 +1,19 @@
+package com.yxt.supervise.crm.api.projectsupervisionlog;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class ProjectSupervisionLogVo implements Vo {
+    private String projectSid;
+    private String logTypeKey;
+    private String logTypeValue;
+    private String logText;
+    private String orderDate;
+    private String regulatoryWork;
+    private String workArrangement;//
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlogfile/ProjectSupervisionLogFile.java

@@ -0,0 +1,23 @@
+package com.yxt.supervise.crm.api.projectsupervisionlogfile;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+@ApiModel(value = "项目阶段 ", description = "项目阶段")
+@TableName("project_phase")
+public class ProjectSupervisionLogFile extends BaseEntity {
+    @ApiModelProperty("主表sid")
+    private String mainsid; // 主表sid
+    @ApiModelProperty("项目附件链接")
+    private String url; // 项目附件链接
+    private String absolutePath; // 项目附件链接
+    private String name; // 项目附件链接
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlogfile/ProjectSupervisionLogFileDto.java

@@ -0,0 +1,26 @@
+package com.yxt.supervise.crm.api.projectsupervisionlogfile;
+
+import com.yxt.common.core.dto.Dto;
+import com.yxt.supervise.crm.api.projectfiles.UrlVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class ProjectSupervisionLogFileDto implements Dto {
+    private String sid;
+    @ApiModelProperty("主表sid")
+    private String mainsid; // 主表sid
+    @ApiModelProperty("项目附件链接")
+    private String url; // 项目附件链接
+    private String absolutePath; // 项目附件链接
+    private String name; // 项目附件链接
+    List<UrlVo> reportList=new ArrayList<>();
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlogfile/ProjectSupervisionLogFileQuery.java

@@ -0,0 +1,16 @@
+package com.yxt.supervise.crm.api.projectsupervisionlogfile;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class ProjectSupervisionLogFileQuery implements Query {
+    private String id;
+    private String sid;
+    private String shSid;
+    private String projectSid;
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlogfile/ProjectSupervisionLogFileVo.java

@@ -0,0 +1,19 @@
+package com.yxt.supervise.crm.api.projectsupervisionlogfile;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class ProjectSupervisionLogFileVo implements Vo {
+    @ApiModelProperty("主表sid")
+    private String mainsid; // 主表sid
+    @ApiModelProperty("项目附件链接")
+    private String url; // 项目附件链接
+    private String absolutePath; // 项目附件链接
+    private String name; // 项目附件链接
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlogfile/UrlVo.java

@@ -0,0 +1,16 @@
+package com.yxt.supervise.crm.api.projectsupervisionlogfile;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/9/13 14:19
+ */
+@Data
+public class UrlVo {
+    @ApiModelProperty("项目附件链接")
+    private String url; // 项目附件链接
+    private String absolutePath; // 绝对路径
+    private String fileSrcName; // 绝对路径
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprog/ProjectEnginProgMapper.java

@@ -0,0 +1,23 @@
+package com.yxt.supervise.crm.biz.projectenginprog;
+
+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.projectenginprog.ProjectEnginProg;
+import com.yxt.supervise.crm.api.projectenginprog.ProjectEnginProgVo;
+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 ProjectEnginProgMapper extends BaseMapper<ProjectEnginProg> {
+    IPage<ProjectEnginProgVo> selectPageVo(IPage<ProjectEnginProg> page, @Param(Constants.WRAPPER) Wrapper<ProjectEnginProg> qw);
+    List<ProjectEnginProgVo> getNodeByEnterpriseSid(@Param("enterpriseSid") String enterpriseSid);
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprog/ProjectEnginProgMapper.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.projectenginprog.ProjectEnginProgMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.crm.api.projectsupervisionlog.ProjectSupervisionLogVo">
+        SELECT cct.*
+        FROM project_phase cct
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="getNodeByEnterpriseSid" resultType="com.yxt.supervise.crm.api.projectsupervisionlog.ProjectSupervisionLogVo">
+        select * from project_phase_dictionary where enterpriseSid=#{enterpriseSid}
+    </select>
+</mapper>

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprog/ProjectEnginProgRest.java

@@ -0,0 +1,61 @@
+package com.yxt.supervise.crm.biz.projectenginprog;
+
+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.projectenginprog.ProjectEnginProgDto;
+import com.yxt.supervise.crm.api.projectenginprog.ProjectEnginProgQuery;
+import com.yxt.supervise.crm.api.projectenginprog.ProjectEnginProgVo;
+import com.yxt.supervise.crm.api.projectenginprogfile.ProjectEnginProgFileVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/23 11:49
+ */
+@Api(tags = "银行负责人信息")
+@RestController
+@RequestMapping("v1/ProjectEnginProg")
+public class ProjectEnginProgRest {
+
+    @Autowired
+    private ProjectEnginProgService ProjectEnginProgService;
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<ProjectEnginProgFileVo>> listPage(@RequestBody PagerQuery<ProjectEnginProgQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ProjectEnginProgVo> pv = ProjectEnginProgService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+
+    @ApiOperation("保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody ProjectEnginProgDto dto) {
+        return ProjectEnginProgService.saveProjectEnginProg(dto);
+    }
+
+
+    @ApiOperation("删除")
+    @DeleteMapping("/delete")
+    public ResultBean del(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        ProjectEnginProgService.delBySids(sids);
+        return rb.success();
+    }
+    @ApiOperation("根据sid查询")
+    @GetMapping("/getManagerBySid/{sid}")
+    public ResultBean<ProjectEnginProgVo> getManagerBySid(@PathVariable String sid) {
+        ResultBean<ProjectEnginProgVo> rb = ResultBean.fireFail();
+        ProjectEnginProgVo vo = ProjectEnginProgService.getManagerBySid(sid);
+        if (vo == null) {
+            return rb.setMsg("该银行联系人不存在");
+        }
+        return rb.success().setData(vo);
+    }
+
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprog/ProjectEnginProgService.java

@@ -0,0 +1,81 @@
+package com.yxt.supervise.crm.biz.projectenginprog;
+
+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.base.utils.StringUtils;
+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.projectenginprog.ProjectEnginProg;
+import com.yxt.supervise.crm.api.projectenginprog.ProjectEnginProgDto;
+import com.yxt.supervise.crm.api.projectenginprog.ProjectEnginProgQuery;
+import com.yxt.supervise.crm.api.projectenginprog.ProjectEnginProgVo;
+import com.yxt.supervise.crm.api.projectenginprogfile.ProjectEnginProgFileDto;
+import com.yxt.supervise.crm.biz.projectenginprogfile.ProjectEnginProgFileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/23 11:49
+ */
+@Service
+public class ProjectEnginProgService extends MybatisBaseService<ProjectEnginProgMapper, ProjectEnginProg> {
+    @Autowired
+    ProjectEnginProgFileService projectEnginProgFileService;
+
+    public PagerVo<ProjectEnginProgVo> listPageVo(PagerQuery<ProjectEnginProgQuery> pq) {
+        ProjectEnginProgQuery query = pq.getParams();
+        QueryWrapper<ProjectEnginProg> qw = new QueryWrapper<>();
+//        if(StringUtils.isNotBlank(query.getEnterpriseName())){
+//            qw.like("enterpriseName",query.getEnterpriseName());
+//        }
+//        if(StringUtils.isNotBlank(query.getTelephone())){
+//            qw.like("telephone",query.getTelephone());
+//        }
+        IPage<ProjectEnginProg> page = PagerUtil.queryToPage(pq);
+        IPage<ProjectEnginProgVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<ProjectEnginProgVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+
+    /**
+     * 新增
+     * @param dto 数据传输对象
+     * @return
+     */
+    public ResultBean saveProjectEnginProg(ProjectEnginProgDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        if(StringUtils.isBlank(dto.getSid())){
+            ProjectEnginProg entity=new ProjectEnginProg();
+            BeanUtil.copyProperties(dto, entity, "id", "sid");
+            baseMapper.insert(entity);
+            ProjectEnginProgFileDto dto1=new ProjectEnginProgFileDto();
+            dto1.setMainsid(entity.getSid());
+            projectEnginProgFileService.saveProjectEnginProgFile(dto1);
+        }else{
+            ProjectEnginProg entity=new ProjectEnginProg();
+            BeanUtil.copyProperties(dto, entity);
+            baseMapper.updateById(entity);
+            ProjectEnginProgFileDto dto1=new ProjectEnginProgFileDto();
+            dto1.setMainsid(entity.getSid());
+            projectEnginProgFileService.saveProjectEnginProgFile(dto1);
+        }
+        return rb.success();
+    }
+
+
+
+
+    public ProjectEnginProgVo getManagerBySid(String sid) {
+        ProjectEnginProgVo vo = new ProjectEnginProgVo();
+        ProjectEnginProg ProjectEnginProg = this.fetchBySid(sid);
+        BeanUtil.copyProperties(ProjectEnginProg, vo);
+        return vo;
+    }
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprogfile/ProjectEnginProgFileMapper.java

@@ -0,0 +1,23 @@
+package com.yxt.supervise.crm.biz.projectenginprogfile;
+
+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.projectenginprogfile.ProjectEnginProgFile;
+import com.yxt.supervise.crm.api.projectenginprogfile.ProjectEnginProgFileVo;
+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 ProjectEnginProgFileMapper extends BaseMapper<ProjectEnginProgFile> {
+    IPage<ProjectEnginProgFileVo> selectPageVo(IPage<ProjectEnginProgFile> page, @Param(Constants.WRAPPER) Wrapper<ProjectEnginProgFile> qw);
+    List<ProjectEnginProgFileVo> getNodeByEnterpriseSid(@Param("enterpriseSid") String enterpriseSid);
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprogfile/ProjectEnginProgFileMapper.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.projectenginprogfile.ProjectEnginProgFileMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.crm.api.projectsupervisionlog.ProjectSupervisionLogVo">
+        SELECT cct.*
+        FROM project_phase cct
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="getNodeByEnterpriseSid" resultType="com.yxt.supervise.crm.api.projectsupervisionlog.ProjectSupervisionLogVo">
+        select * from project_phase_dictionary where enterpriseSid=#{enterpriseSid}
+    </select>
+</mapper>

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprogfile/ProjectEnginProgFileRest.java

@@ -0,0 +1,49 @@
+package com.yxt.supervise.crm.biz.projectenginprogfile;
+
+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.projectenginprogfile.ProjectEnginProgFileDto;
+import com.yxt.supervise.crm.api.projectenginprogfile.ProjectEnginProgFileQuery;
+import com.yxt.supervise.crm.api.projectenginprogfile.ProjectEnginProgFileVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/23 11:49
+ */
+@Api(tags = "银行负责人信息")
+@RestController
+@RequestMapping("v1/ProjectEnginProgFile")
+public class ProjectEnginProgFileRest {
+
+    @Autowired
+    private ProjectEnginProgFileService ProjectEnginProgFileService;
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<ProjectEnginProgFileVo>> listPage(@RequestBody PagerQuery<ProjectEnginProgFileQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ProjectEnginProgFileVo> pv = ProjectEnginProgFileService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+
+    @ApiOperation("保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody ProjectEnginProgFileDto dto) {
+        return ProjectEnginProgFileService.saveProjectEnginProgFile(dto);
+    }
+
+
+    @ApiOperation("删除")
+    @DeleteMapping("/delete")
+    public ResultBean del(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        ProjectEnginProgFileService.delBySids(sids);
+        return rb.success();
+    }
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprogfile/ProjectEnginProgFileService.java

@@ -0,0 +1,78 @@
+package com.yxt.supervise.crm.biz.projectenginprogfile;
+
+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.config.component.FileUploadComponent;
+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.projectenginprogfile.ProjectEnginProgFile;
+import com.yxt.supervise.crm.api.projectenginprogfile.ProjectEnginProgFileDto;
+import com.yxt.supervise.crm.api.projectenginprogfile.ProjectEnginProgFileQuery;
+import com.yxt.supervise.crm.api.projectenginprogfile.ProjectEnginProgFileVo;
+import com.yxt.supervise.crm.api.projectfiles.UrlVo;
+import com.yxt.supervise.crm.biz.enterpriseproject.EnterpriseProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/23 11:49
+ */
+@Service
+public class ProjectEnginProgFileService extends MybatisBaseService<ProjectEnginProgFileMapper, ProjectEnginProgFile> {
+    @Autowired
+    com.yxt.supervise.crm.feign.system.SysUserFeign sysUserFeign;
+    @Autowired
+    EnterpriseProjectService enterpriseProjectService;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+
+
+    public PagerVo<ProjectEnginProgFileVo> listPageVo(PagerQuery<ProjectEnginProgFileQuery> pq) {
+        ProjectEnginProgFileQuery query = pq.getParams();
+        QueryWrapper<ProjectEnginProgFile> qw = new QueryWrapper<>();
+//        if(StringUtils.isNotBlank(query.getEnterpriseName())){
+//            qw.like("enterpriseName",query.getEnterpriseName());
+//        }
+//        if(StringUtils.isNotBlank(query.getTelephone())){
+//            qw.like("telephone",query.getTelephone());
+//        }
+        IPage<ProjectEnginProgFile> page = PagerUtil.queryToPage(pq);
+        IPage<ProjectEnginProgFileVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<ProjectEnginProgFileVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+
+    /**
+     * 新增
+     * @param dto 数据传输对象
+     * @return
+     */
+    public ResultBean saveProjectEnginProgFile(ProjectEnginProgFileDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        ProjectEnginProgFile entity=new ProjectEnginProgFile();
+        String urlPrefix = fileUploadComponent.getUrlPrefix();
+        baseMapper.delete(new QueryWrapper<ProjectEnginProgFile>().eq("mainsid",dto.getMainsid()));
+        for (UrlVo urlVo : dto.getReportList()) {
+            BeanUtil.copyProperties(dto, entity, "id", "sid");
+            entity.setAbsolutePath(urlVo.getUrl());
+            String path = urlVo.getUrl().substring(urlPrefix.length());
+            urlVo.setUrl(path);
+            entity.setName(urlVo.getFileSrcName());
+            entity.setUrl(urlVo.getUrl());
+            baseMapper.insert(entity);
+        }
+        return rb.success();
+    }
+
+
+
+
+
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectshgm/ProjectShGmMapper.java

@@ -0,0 +1,23 @@
+package com.yxt.supervise.crm.biz.projectshgm;
+
+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.projectshgm.ProjectShGm;
+import com.yxt.supervise.crm.api.projectshgm.ProjectShGmVo;
+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 ProjectShGmMapper extends BaseMapper<ProjectShGm> {
+    IPage<ProjectShGmVo> selectPageVo(IPage<ProjectShGm> page, @Param(Constants.WRAPPER) Wrapper<ProjectShGm> qw);
+    List<ProjectShGmVo> getNodeByEnterpriseSid(@Param("enterpriseSid") String enterpriseSid);
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectshgm/ProjectShGmMapper.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.projectshgm.ProjectShGmMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.crm.api.projectshgm.ProjectShGmVo">
+        SELECT cct.*
+        FROM project_phase cct
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="getNodeByEnterpriseSid" resultType="com.yxt.supervise.crm.api.projectshgm.ProjectShGmVo">
+        select * from project_phase_dictionary where enterpriseSid=#{enterpriseSid}
+    </select>
+</mapper>

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectshgm/ProjectShGmRest.java

@@ -0,0 +1,51 @@
+package com.yxt.supervise.crm.biz.projectshgm;
+
+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.projectshgm.ProjectShGmDto;
+import com.yxt.supervise.crm.api.projectshgm.ProjectShGmQuery;
+import com.yxt.supervise.crm.api.projectshgm.ProjectShGmVo;
+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/projectshmm")
+public class ProjectShGmRest {
+
+    @Autowired
+    private ProjectShGmService ProjectShGmService;
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<ProjectShGmVo>> listPage(@RequestBody PagerQuery<ProjectShGmQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ProjectShGmVo> pv = ProjectShGmService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+
+    @ApiOperation("保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody ProjectShGmDto dto) {
+        return ProjectShGmService.saveProjectShGm(dto);
+    }
+
+
+    @ApiOperation("删除")
+    @DeleteMapping("/delete")
+    public ResultBean del(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        ProjectShGmService.delBySids(sids);
+        return rb.success();
+    }
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectshgm/ProjectShGmService.java

@@ -0,0 +1,62 @@
+package com.yxt.supervise.crm.biz.projectshgm;
+
+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.projectshgm.ProjectShGm;
+import com.yxt.supervise.crm.api.projectshgm.ProjectShGmDto;
+import com.yxt.supervise.crm.api.projectshgm.ProjectShGmQuery;
+import com.yxt.supervise.crm.api.projectshgm.ProjectShGmVo;
+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 ProjectShGmService extends MybatisBaseService<ProjectShGmMapper, ProjectShGm> {
+    @Autowired
+    com.yxt.supervise.crm.feign.system.SysUserFeign sysUserFeign;
+    @Autowired
+    EnterpriseProjectService enterpriseProjectService;
+
+    public PagerVo<ProjectShGmVo> listPageVo(PagerQuery<ProjectShGmQuery> pq) {
+        ProjectShGmQuery query = pq.getParams();
+        QueryWrapper<ProjectShGm> qw = new QueryWrapper<>();
+//        if(StringUtils.isNotBlank(query.getEnterpriseName())){
+//            qw.like("enterpriseName",query.getEnterpriseName());
+//        }
+//        if(StringUtils.isNotBlank(query.getTelephone())){
+//            qw.like("telephone",query.getTelephone());
+//        }
+        IPage<ProjectShGm> page = PagerUtil.queryToPage(pq);
+        IPage<ProjectShGmVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<ProjectShGmVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+
+    /**
+     * 新增
+     * @param dto 数据传输对象
+     * @return
+     */
+    public ResultBean saveProjectShGm(ProjectShGmDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        ProjectShGm entity=new ProjectShGm();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+        return rb.success();
+    }
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectsupervisionlog/ProjectSupervisionLogMapper.java

@@ -0,0 +1,23 @@
+package com.yxt.supervise.crm.biz.projectsupervisionlog;
+
+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.projectsupervisionlog.ProjectSupervisionLog;
+import com.yxt.supervise.crm.api.projectsupervisionlog.ProjectSupervisionLogVo;
+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 ProjectSupervisionLogMapper extends BaseMapper<ProjectSupervisionLog> {
+    IPage<ProjectSupervisionLogVo> selectPageVo(IPage<ProjectSupervisionLog> page, @Param(Constants.WRAPPER) Wrapper<ProjectSupervisionLog> qw);
+    List<ProjectSupervisionLogVo> getNodeByEnterpriseSid(@Param("enterpriseSid") String enterpriseSid);
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectsupervisionlog/ProjectSupervisionLogMapper.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.projectsupervisionlog.ProjectSupervisionLogMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.crm.api.projectsupervisionlog.ProjectSupervisionLogVo">
+        SELECT cct.*
+        FROM project_phase cct
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="getNodeByEnterpriseSid" resultType="com.yxt.supervise.crm.api.projectsupervisionlog.ProjectSupervisionLogVo">
+        select * from project_phase_dictionary where enterpriseSid=#{enterpriseSid}
+    </select>
+</mapper>

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectsupervisionlog/ProjectSupervisionLogRest.java

@@ -0,0 +1,62 @@
+package com.yxt.supervise.crm.biz.projectsupervisionlog;
+
+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.projectsupervisionlog.ProjectSupervisionLogDto;
+import com.yxt.supervise.crm.api.projectsupervisionlog.ProjectSupervisionLogQuery;
+import com.yxt.supervise.crm.api.projectsupervisionlog.ProjectSupervisionLogVo;
+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/ProjectSupervisionLog")
+public class ProjectSupervisionLogRest {
+
+    @Autowired
+    private ProjectSupervisionLogService ProjectSupervisionLogService;
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<ProjectSupervisionLogVo>> listPage(@RequestBody PagerQuery<ProjectSupervisionLogQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ProjectSupervisionLogVo> pv = ProjectSupervisionLogService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+
+    @ApiOperation("保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody ProjectSupervisionLogDto dto) {
+        return ProjectSupervisionLogService.saveProjectSupervisionLog(dto);
+    }
+
+
+    @ApiOperation("删除")
+    @DeleteMapping("/delete")
+    public ResultBean del(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        ProjectSupervisionLogService.delBySids(sids);
+        return rb.success();
+    }
+    @ApiOperation("根据sid查询")
+    @GetMapping("/getManagerBySid/{sid}")
+    public ResultBean<ProjectSupervisionLogVo> getManagerBySid(@PathVariable String sid) {
+        ResultBean<ProjectSupervisionLogVo> rb = ResultBean.fireFail();
+        ProjectSupervisionLogVo vo = ProjectSupervisionLogService.getManagerBySid(sid);
+        if (vo == null) {
+            return rb.setMsg("该银行联系人不存在");
+        }
+        return rb.success().setData(vo);
+    }
+
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectsupervisionlog/ProjectSupervisionLogService.java

@@ -0,0 +1,85 @@
+package com.yxt.supervise.crm.biz.projectsupervisionlog;
+
+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.base.utils.StringUtils;
+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.projectsupervisionlog.ProjectSupervisionLog;
+import com.yxt.supervise.crm.api.projectsupervisionlog.ProjectSupervisionLogDto;
+import com.yxt.supervise.crm.api.projectsupervisionlog.ProjectSupervisionLogQuery;
+import com.yxt.supervise.crm.api.projectsupervisionlog.ProjectSupervisionLogVo;
+import com.yxt.supervise.crm.api.projectsupervisionlogfile.ProjectSupervisionLogFileDto;
+import com.yxt.supervise.crm.biz.enterpriseproject.EnterpriseProjectService;
+import com.yxt.supervise.crm.biz.projectsupervisionlogfile.ProjectSupervisionLogFileService;
+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 ProjectSupervisionLogService extends MybatisBaseService<ProjectSupervisionLogMapper, ProjectSupervisionLog> {
+    @Autowired
+    ProjectSupervisionLogFileService  projectSupervisionLogFileService;
+
+    public PagerVo<ProjectSupervisionLogVo> listPageVo(PagerQuery<ProjectSupervisionLogQuery> pq) {
+        ProjectSupervisionLogQuery query = pq.getParams();
+        QueryWrapper<ProjectSupervisionLog> qw = new QueryWrapper<>();
+//        if(StringUtils.isNotBlank(query.getEnterpriseName())){
+//            qw.like("enterpriseName",query.getEnterpriseName());
+//        }
+//        if(StringUtils.isNotBlank(query.getTelephone())){
+//            qw.like("telephone",query.getTelephone());
+//        }
+        IPage<ProjectSupervisionLog> page = PagerUtil.queryToPage(pq);
+        IPage<ProjectSupervisionLogVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<ProjectSupervisionLogVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+
+    /**
+     * 新增
+     * @param dto 数据传输对象
+     * @return
+     */
+    public ResultBean saveProjectSupervisionLog(ProjectSupervisionLogDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        if(StringUtils.isBlank(dto.getSid())){
+            ProjectSupervisionLog entity=new ProjectSupervisionLog();
+            BeanUtil.copyProperties(dto, entity, "id", "sid");
+            baseMapper.insert(entity);
+            ProjectSupervisionLogFileDto dto1=new ProjectSupervisionLogFileDto();
+            dto1.setMainsid(entity.getSid());
+            projectSupervisionLogFileService.saveProjectSupervisionLogFile(dto1);
+        }else{
+            ProjectSupervisionLog entity=new ProjectSupervisionLog();
+            BeanUtil.copyProperties(dto, entity);
+            baseMapper.updateById(entity);
+            ProjectSupervisionLogFileDto dto1=new ProjectSupervisionLogFileDto();
+            dto1.setMainsid(entity.getSid());
+            projectSupervisionLogFileService.saveProjectSupervisionLogFile(dto1);
+        }
+        return rb.success();
+    }
+
+
+
+
+    public ProjectSupervisionLogVo getManagerBySid(String sid) {
+        ProjectSupervisionLogVo vo = new ProjectSupervisionLogVo();
+        ProjectSupervisionLog ProjectSupervisionLog = this.fetchBySid(sid);
+        BeanUtil.copyProperties(ProjectSupervisionLog, vo);
+        return vo;
+    }
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectsupervisionlogfile/ProjectSupervisionLogFileMapper.java

@@ -0,0 +1,23 @@
+package com.yxt.supervise.crm.biz.projectsupervisionlogfile;
+
+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.projectsupervisionlogfile.ProjectSupervisionLogFile;
+import com.yxt.supervise.crm.api.projectsupervisionlogfile.ProjectSupervisionLogFileVo;
+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 ProjectSupervisionLogFileMapper extends BaseMapper<ProjectSupervisionLogFile> {
+    IPage<ProjectSupervisionLogFileVo> selectPageVo(IPage<ProjectSupervisionLogFile> page, @Param(Constants.WRAPPER) Wrapper<ProjectSupervisionLogFile> qw);
+    List<ProjectSupervisionLogFileVo> getNodeByEnterpriseSid(@Param("enterpriseSid") String enterpriseSid);
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectsupervisionlogfile/ProjectSupervisionLogFileMapper.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.projectsupervisionlog.ProjectSupervisionLogMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.crm.api.projectsupervisionlog.ProjectSupervisionLogVo">
+        SELECT cct.*
+        FROM project_phase cct
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="getNodeByEnterpriseSid" resultType="com.yxt.supervise.crm.api.projectsupervisionlog.ProjectSupervisionLogVo">
+        select * from project_phase_dictionary where enterpriseSid=#{enterpriseSid}
+    </select>
+</mapper>

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectsupervisionlogfile/ProjectSupervisionLogFileRest.java

@@ -0,0 +1,51 @@
+package com.yxt.supervise.crm.biz.projectsupervisionlogfile;
+
+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.projectsupervisionlogfile.ProjectSupervisionLogFileDto;
+import com.yxt.supervise.crm.api.projectsupervisionlogfile.ProjectSupervisionLogFileQuery;
+import com.yxt.supervise.crm.api.projectsupervisionlogfile.ProjectSupervisionLogFileVo;
+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/ProjectSupervisionLogFile")
+public class ProjectSupervisionLogFileRest {
+
+    @Autowired
+    private ProjectSupervisionLogFileService ProjectSupervisionLogFileService;
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<ProjectSupervisionLogFileVo>> listPage(@RequestBody PagerQuery<ProjectSupervisionLogFileQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ProjectSupervisionLogFileVo> pv = ProjectSupervisionLogFileService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+
+    @ApiOperation("保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody ProjectSupervisionLogFileDto dto) {
+        return ProjectSupervisionLogFileService.saveProjectSupervisionLogFile(dto);
+    }
+
+
+    @ApiOperation("删除")
+    @DeleteMapping("/delete")
+    public ResultBean del(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        ProjectSupervisionLogFileService.delBySids(sids);
+        return rb.success();
+    }
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectsupervisionlogfile/ProjectSupervisionLogFileService.java

@@ -0,0 +1,81 @@
+package com.yxt.supervise.crm.biz.projectsupervisionlogfile;
+
+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.config.component.FileUploadComponent;
+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.projectfiles.UrlVo;
+import com.yxt.supervise.crm.api.projectsupervisionlogfile.ProjectSupervisionLogFile;
+import com.yxt.supervise.crm.api.projectsupervisionlogfile.ProjectSupervisionLogFileDto;
+import com.yxt.supervise.crm.api.projectsupervisionlogfile.ProjectSupervisionLogFileQuery;
+import com.yxt.supervise.crm.api.projectsupervisionlogfile.ProjectSupervisionLogFileVo;
+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 ProjectSupervisionLogFileService extends MybatisBaseService<ProjectSupervisionLogFileMapper, ProjectSupervisionLogFile> {
+    @Autowired
+    com.yxt.supervise.crm.feign.system.SysUserFeign sysUserFeign;
+    @Autowired
+    EnterpriseProjectService enterpriseProjectService;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+
+
+    public PagerVo<ProjectSupervisionLogFileVo> listPageVo(PagerQuery<ProjectSupervisionLogFileQuery> pq) {
+        ProjectSupervisionLogFileQuery query = pq.getParams();
+        QueryWrapper<ProjectSupervisionLogFile> qw = new QueryWrapper<>();
+//        if(StringUtils.isNotBlank(query.getEnterpriseName())){
+//            qw.like("enterpriseName",query.getEnterpriseName());
+//        }
+//        if(StringUtils.isNotBlank(query.getTelephone())){
+//            qw.like("telephone",query.getTelephone());
+//        }
+        IPage<ProjectSupervisionLogFile> page = PagerUtil.queryToPage(pq);
+        IPage<ProjectSupervisionLogFileVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<ProjectSupervisionLogFileVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+
+    /**
+     * 新增
+     * @param dto 数据传输对象
+     * @return
+     */
+    public ResultBean saveProjectSupervisionLogFile(ProjectSupervisionLogFileDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        ProjectSupervisionLogFile entity=new ProjectSupervisionLogFile();
+        String urlPrefix = fileUploadComponent.getUrlPrefix();
+        baseMapper.delete(new QueryWrapper<ProjectSupervisionLogFile>().eq("mainsid",dto.getMainsid()));
+        for (UrlVo urlVo : dto.getReportList()) {
+            BeanUtil.copyProperties(dto, entity, "id", "sid");
+            entity.setAbsolutePath(urlVo.getUrl());
+            String path = urlVo.getUrl().substring(urlPrefix.length());
+            urlVo.setUrl(path);
+            entity.setName(urlVo.getFileSrcName());
+            entity.setUrl(urlVo.getUrl());
+            baseMapper.insert(entity);
+        }
+        return rb.success();
+    }
+
+
+
+
+
+
+}

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

@@ -0,0 +1,53 @@
+package com.yxt.supervise.report.biz.datacenter;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.http.ResponseEntity;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/10/17 13:51
+ */
+public class A<T> implements Serializable {
+    public List<T> getList (ResponseEntity<String> stringResponseEntity,Class<T> t){
+        JSONArray jsonArray=com.alibaba.fastjson.JSONObject.parseObject(stringResponseEntity.getBody()).getJSONArray("data");
+        List<T> vos=new ArrayList<>();
+        if(null==jsonArray){
+            return new ArrayList<T>();
+        }
+        for (int i = 0; i < jsonArray.size(); i++) {
+            T d= JSON.toJavaObject(jsonArray.getJSONObject(i),t);
+            vos.add(d);
+        }
+        return vos;
+    }
+    public List<T> getListPage (ResponseEntity<String> stringResponseEntity,Class<T> t){
+        JSONObject jsonObject=com.alibaba.fastjson.JSONObject.parseObject(stringResponseEntity.getBody());
+        JSONObject js=jsonObject.getJSONObject("data");
+        JSONArray jsonArray=js.getJSONArray("records");
+        List<T> vos=new ArrayList<>();
+        if(null==jsonObject){
+            return new ArrayList<T>();
+        }
+        for (int i = 0; i < jsonArray.size(); i++) {
+            T d= JSON.toJavaObject(jsonArray.getJSONObject(i),t);
+            vos.add(d);
+        }
+        return vos;
+    }
+    public T  getObject(ResponseEntity<String> stringResponseEntity,Class<T> t){
+        JSONObject jsonObject =com.alibaba.fastjson.JSONObject.parseObject(stringResponseEntity.getBody()).getJSONObject("data");
+        T d=JSON.toJavaObject(jsonObject,t);
+        return d;
+    }
+    public Integer getInteger (ResponseEntity<String> stringResponseEntity){
+        Integer a=JSONObject.parseObject(stringResponseEntity.getBody()).getInteger("data");
+        return a;
+    }
+
+}

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

@@ -0,0 +1,192 @@
+package com.yxt.supervise.report.biz.datacenter;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: anrui-crm(客户管理) <br/>
+ * File: CrmCustomerTempVo.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo <br/>
+ * Description: 潜在客户信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-01-12 11:21:16 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "潜在客户信息 视图数据对象", description = "潜在客户信息 视图数据对象")
+@Data
+public class CrmCustomerTempVo implements Vo {
+
+    @ApiModelProperty("潜在客户sid")
+    private String sid;
+
+    @ApiModelProperty("分公司名称")
+    private String createOrgName;
+
+    @ApiModelProperty("业务员名称")
+    private String staffName;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
+
+    @ApiModelProperty("登记日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
+
+	@ApiModelProperty("客户编号（部门编码+客户类型（1位，0个人，1企业）+部门内部流水号（6位））")
+    private String customerNo;
+
+	@ApiModelProperty("客户类型（自然人/法人）")
+    private String customerType;
+
+	@ApiModelProperty("客户类型key")
+    private String customerTypeKey;
+
+	@ApiModelProperty("客户分类（个人：司机/个体老板/其他。企业：企业型客户/一级经销商/二级经销商/终端物流客户）")
+    private String customerClass;
+
+	@ApiModelProperty("客户分类key")
+    private String customerClassKey;
+
+	@ApiModelProperty("客户来源（公司资源/自主开发/交接客户/转介绍客户/集团内销）")
+    private String source;
+
+	@ApiModelProperty("客户来源key")
+    private String sourceKey;
+
+	@ApiModelProperty("客户级别（意向客户/准客户/成交客户/集团内销/黑名单客户）")
+    private String level;
+
+	@ApiModelProperty("客户级别key")
+    private String levelKey;
+
+	@ApiModelProperty("客户名称")
+    private String name;
+
+    @ApiModelProperty("证件类型key")
+    private String certificateTypeKey;
+
+	@ApiModelProperty("证件类型（个人为身份证/企业为营业执照）")
+    private String certificateType;
+
+	@ApiModelProperty("证件号码（个人为身份证号/企业为统一社会信用代码）")
+    private String IDNumber;
+
+	@ApiModelProperty("证件有效期")
+    private String endDate;
+
+	@ApiModelProperty("行政区划代码（省）")
+    private String address_province;
+
+	@ApiModelProperty("行政区划代码（市）")
+    private String address_city;
+
+	@ApiModelProperty("行政区划代码（县）")
+    private String address_county;
+
+	@ApiModelProperty("省")
+    private String province;
+
+	@ApiModelProperty("市")
+    private String city;
+
+	@ApiModelProperty("县")
+    private String county;
+
+	@ApiModelProperty("客户地址")
+    private String address;
+
+	@ApiModelProperty("邮编")
+    private String zipCode;
+
+	@ApiModelProperty("电子邮箱")
+    private String e_mail;
+
+	@ApiModelProperty("联系人")
+    private String contacts;
+
+	@ApiModelProperty("联系电话")
+    private String mobile;
+
+    @ApiModelProperty("紧急联系电话")
+    private String emergencyContact;
+
+    @ApiModelProperty("紧急联系电话")
+    private String emergencyMobile;
+
+	@ApiModelProperty("微信号码")
+    private String weixin;
+
+	@ApiModelProperty("业务人员sid")
+    private String staffSid;
+
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+
+	@ApiModelProperty("性别")
+    private String sex;
+
+    @ApiModelProperty("性别key")
+    private String sexKey;
+
+	@ApiModelProperty("客户生日")
+    private String birthday;
+
+	@ApiModelProperty("所在公司名称")
+    private String companyName;
+
+    @ApiModelProperty("跟进状态key")
+    private String follow_state_key;
+
+	@ApiModelProperty("跟进状态")
+    private String follow_state;
+
+    @ApiModelProperty("是否开启提醒key（1开启，0不开启）")
+    private String isOnRemindkey;
+
+    @ApiModelProperty("是否开启提醒（1开启，0不开启）")
+    private String isOnRemind;
+
+	@ApiModelProperty("提醒日期")
+    private String remind_day;
+
+	@ApiModelProperty("提醒备注")
+    private String remind_remark;
+
+	@ApiModelProperty("客户头像")
+    private String customerPhoto;
+
+    @ApiModelProperty("见面方式key")
+    private String visitWayKey;
+
+    @ApiModelProperty("见面方式（到店/电话/拜访）")
+    private String visitWay;
+
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    @ApiModelProperty("意向车型数量")
+    private String yxcounts;
+
+    @ApiModelProperty("跟进记录数量")
+    private String gjcounts;
+
+
+
+    private String useOrgSid;
+    private String customerOrgSid;
+    private String customerOrgName;
+
+}

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

@@ -6,19 +6,29 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.PinYinUtils;
 import com.yxt.common.base.utils.StringUtils;
+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.report.biz.projectdaily.ProjectDailyService;
 import com.yxt.supervise.report.biz.projectdaily.ProjectDailyVos;
 import com.yxt.supervise.report.biz.projectdaily.ProjectDailys;
+import com.yxt.supervise.report.biz.projectfiles.UrlVo;
 import com.yxt.supervise.report.biz.projectinformation.WarehouseInfoVo;
 import com.yxt.supervise.report.biz.projectphaserecord.ProjectPhaseRecordDto;
 import com.yxt.supervise.report.biz.reportinventory.ReportInventoryDayGatherService;
 import com.yxt.supervise.report.ds.crm.*;
 import com.yxt.supervise.report.feign.crm.projectphaserecord.ProjectPhaseRecordFeign;
+import com.yxt.supervise.report.feign.crm.projectshgm.ProjectShGmDto;
 import com.yxt.supervise.report.feign.monitor.YDeviceFeign;
 import com.yxt.supervise.report.feign.monitor.YDeviceImageFeign;
+import com.yxt.supervise.report.shanhai.ShRequester;
+import com.yxt.supervise.report.shanhai.req.IndexQuery;
+import com.yxt.supervise.report.shanhai.resp.*;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -26,6 +36,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -188,8 +199,8 @@ public class DataCenterRest {
     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";
+        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());
@@ -203,10 +214,12 @@ public class DataCenterRest {
                 List<ShCreditBalanceCrmVo> vos=crmMapper.getBalanceByProjectSid(info.getProjectSid());
                 for (ShCreditBalanceCrmVo vo : vos) {
                     if(vo.getType().equals("1")){
+                        String nodde=crmMapper.getNodeValueByProjectSid(info.getSid());
                         projectDetailsVo.setExpectedCompletionDate(vo.getExpectedCompletionDate());
                         projectDetailsVo.setExpectedDeliveryDate(vo.getExpectedDeliveryDate());
-                        projectDetailsVo.setCreditStage(vo.getCreditStage());
+                        projectDetailsVo.setCreditStage(nodde);
                         projectDetailsVo.setCreditNature(vo.getCreditNature());
+                        projectDetailsVo.setTbdate(vo.getTbdate());
                         projectDetailsVo.setMoney(projectDetailsVo.getMoney().add(vo.getMoney()));
                     }else{
                         projectDetailsVo.setHkMoney(projectDetailsVo.getMoney().add(vo.getMoney()));
@@ -233,12 +246,15 @@ public class DataCenterRest {
         ShDateCenterVo shDateCenterVo=new ShDateCenterVo();
         List<ProjectInfo> projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid());
         RestTemplate restTemplate = new RestTemplate();
+        String a ="http://192.168.0.105:6023/apiadmin/warehouseinfo/list";
         ResponseEntity<String> forEntity = restTemplate.getForEntity("https://wms.yxtsoft.com/apiv1/external/v1/crmcustomertemp/getCustomerByOrgSid?orgSid="+projectInfo.get(0).getEnterpriseSid(),String.class);
+//        ResponseEntity<String> forEntity = restTemplate.getForEntity("http://192.168.0.105:6023/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);
+//        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);
+        List<SupplierInfoVo> supplierInfoVo = c.getList(forEntity1, SupplierInfoVo.class);
+        shDateCenterVo.setDownstreamEnterprises(jsonObject.size());
+        shDateCenterVo.setUpstreamEnterprises(supplierInfoVo.size());
         List<ProjectInfo> projectInfoList=crmMapper.getProjectcs(projectInfo.get(0).getEnterpriseSid());
         List<ProjectInfo> projectInfoLists=crmMapper.getNodeValue(projectInfo.get(0).getEnterpriseSid());
         int b=0;
@@ -298,6 +314,7 @@ public class DataCenterRest {
         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();
+//        String a1 ="http://192.168.0.105:6023/v1/crmcustomertemp/getCustomerByOrgSid?orgSid="+projectInfo.get(0).getEnterpriseSid();
         RestTemplate restTemplate = new RestTemplate();
         ResponseEntity<String> forEntity = restTemplate.getForEntity(a1,String.class);
         Integer jsonObject =c.getInteger(forEntity);
@@ -340,6 +357,7 @@ public class DataCenterRest {
         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();
+//        String a1 ="http://192.168.0.105:6023/apiadmin/warehouseinfo/getWarehouseCountByOrgSid?orgSid="+projectInfo.get(0).getEnterpriseSid();
         RestTemplate restTemplate = new RestTemplate();
         ResponseEntity<String> forEntity = restTemplate.getForEntity(a1,String.class);
         List<WarehouseInfoVoSheng> vos= d.getList(forEntity,WarehouseInfoVoSheng.class);
@@ -410,29 +428,274 @@ public class DataCenterRest {
         map.put("list",projectRecordVos);
         return rb.success().setData(map);
     }
+    @ApiOperation("电站统计")
+    @PostMapping("/shDZTJ")
+    public ResultBean shDZTJ(@RequestBody IndexQuery query){
+        ResultBean rb=new ResultBean();
+        Map<String,Object> map=new HashMap<>();
+        IndexVo vo=ShRequester.getscreen$enterprise$index(query);
+        map.put("enterprise_month",vo.getEnterprise_month());
+        map.put("enterprise_year",vo.getEnterprise_year());
+        List<String> name =new ArrayList<>();
+        List<BigDecimal> enterprise_power =new ArrayList<>();
+        for (NearVo nearVo : vo.getNear_day()) {
+            name.add(nearVo.getName());
+            enterprise_power.add(nearVo.getEnterprise_power());
+        }
+        map.put("name",name);
+        map.put("enterprise_power",enterprise_power);
+        return rb.success().setData(map);
+    }
+    @ApiOperation("项目规格")
+    @PostMapping("/shXMGG")
+    public ResultBean shXMGG(@RequestBody IndexQuery query){
+        ResultBean rb=new ResultBean();
+
+        Map<String,Object> map=new HashMap<>();
+        List<String> title=new ArrayList<>();
+        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));
+        long i=DateUtil.betweenMonth(DateUtil.parse(query.getDate()),DateUtil.parse(EndDate),true);
+        List<String> a=new ArrayList<>();
+        List<String> dkzcCount=new ArrayList<>();
+        List<String> dkzc=new ArrayList<>();
+        List<String> ztzCount=new ArrayList<>();
+        List<String> ztz=new ArrayList<>();
+        for(int k=0;k<i+1;k++){
+            SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM");
+            String date=sdf1.format(DateUtil.offsetMonth(DateUtil.parse(query.getDate()),-k));
+            a.add(date);
+            ShGmVo vo=crmMapper.getGm(date);
+            if(null!=vo){
+                dkzcCount.add(vo.getDkzcCount().toString());
+                dkzc.add(vo.getDkzc().divide(new BigDecimal(10000)).toString());
+                ztzCount.add(vo.getZtzCount().toString());
+                ztz.add(vo.getZtz().divide(new BigDecimal(10000)).toString());
+            }else{
+                dkzcCount.add("0");
+                dkzc.add("0");
+                ztzCount.add("0");
+                ztz.add("0");
+            }
+        }
+        map.put("date",a);
+        map.put("dkzcCount",dkzcCount);
+        map.put("dkzc",dkzc);
+        map.put("ztz",ztz);
+        map.put("ztzCount",ztzCount);
+        return rb.success().setData(map);
+    }
+    @ApiOperation("项目分页列表")
+    @PostMapping("/getProjectPageList")
+    public Object getProjectPageList(@RequestBody PagerQuery<IndexQuery> pq){
+        ResultBean rb=new ResultBean().fail();
+        IndexQuery query = pq.getParams();
+        QueryWrapper<IndexQuery> qw = new QueryWrapper<>();
+
+        qw.eq("c.nodeValue",query.getNodeValue());
+        if(StringUtils.isNotBlank(query.getCreditNature())){
+            qw.eq("e.creditNature",query.getCreditNature());
+        }
+
+        if(StringUtils.isNotBlank(query.getProjectSid())){
+            List<ProjectInfo> projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid());
+            if(projectInfo.size()!=0){
+                qw.eq("b.enterpriseSid",projectInfo.get(0).getEnterpriseSid());
+            }
+        }else{
+            return rb.setMsg("项目sid为空");
+        }
+        List<String> pagging = crmMapper.getProjectPageList(qw);
+        A c=new A();
+        String a ="https://wms.yxtsoft.com/apiv1/external/apiadmin/warehouseinfo/listPageN";
+//        String a ="http://192.168.0.105:6023/apiadmin/warehouseinfo/listPageN";
+        Map<String, Object> sendBodyMM = new HashMap<>();
+        Map<String, Object> sendBody = new HashMap<>();
+
+        List<ProjectInfo> projectInfo=crmMapper.getEnterByProjetSid(query.getProjectSid());
+
+        sendBodyMM.put("current",pq.getCurrent());
+        sendBodyMM.put("size",pq.getSize());
+        sendBody.put("orgPath",projectInfo.get(0).getEnterpriseSid());
+        sendBody.put("sids",pagging);
+        if(StringUtils.isNotBlank(query.getAddress())){
+            sendBody.put("address",query.getAddress());
+        }
+        if(StringUtils.isNotBlank(query.getWarehouseName())){
+            sendBody.put("warehouseName",query.getWarehouseName());
+        }
+        if(StringUtils.isNotBlank(query.getWarehouseCode())){
+            sendBody.put("warehouseCode",query.getWarehouseCode());
+        }
+        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());
+        ResultBean js2= JSON.toJavaObject(jsonObject,ResultBean.class);
+        if(!js2.getCode().equals("200")){
+            return  js2;
+        }
+        JSONObject js=jsonObject.getJSONObject("data");
+        PagerVo js1= JSON.toJavaObject(js,PagerVo.class);
+        JSONArray jsonArray=js.getJSONArray("records");
+        List<ProjectDetailsVo> projectDetailsVos=new ArrayList<>();
+        for (int i = 0; i < jsonArray.size(); i++) {
+            ProjectDetailsVo d= JSON.toJavaObject(jsonArray.getJSONObject(i),ProjectDetailsVo.class);
+            projectDetailsVos.add(d);
+        }
+        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")){
+                        String nodde=crmMapper.getNodeValueByProjectSid(info.getSid());
+                        projectDetailsVo.setExpectedCompletionDate(vo.getExpectedCompletionDate());
+                        projectDetailsVo.setExpectedDeliveryDate(vo.getExpectedDeliveryDate());
+                        projectDetailsVo.setCreditStage(nodde);
+                        projectDetailsVo.setCreditNature(vo.getCreditNature());
+                        projectDetailsVo.setMoney(projectDetailsVo.getMoney().add(vo.getMoney()));
+                        projectDetailsVo.setTbdate(vo.getTbdate());
+                    }else{
+                        projectDetailsVo.setHkMoney(projectDetailsVo.getMoney().add(vo.getMoney()));
+                    }
+                }
+                List<ProjectEngineeringProgressVo> vos1=crmMapper.getEngineeringByProject(info.getProjectSid());
+                for (ProjectEngineeringProgressVo projectEngineeringProgressVo : vos1) {
+                    List<UrlsVo> urlVos=crmMapper.getEnginProgFile(projectEngineeringProgressVo.getSid());
+                    projectEngineeringProgressVo.setUrls(urlVos);
+                }
+                projectDetailsVo.setProjectEngineeringList(vos1);
+                if(vos1.size()!=0){
+                    projectDetailsVo.setProjectEngineeringProgress(vos1.get(0));
+                }
+                List<ProjectSupervisionLogVo> vo33=crmMapper.getLogByProject(info.getProjectSid());
+                for (ProjectSupervisionLogVo projectSupervisionLogVo : vo33) {
+                    List<UrlsVo> urlVos=crmMapper.getSupervisionLogFile(projectSupervisionLogVo.getSid());
+                    projectSupervisionLogVo.setUrls(urlVos);
+                }
+                projectDetailsVo.setProjectSupervisionLogList(vo33);
+                if(vo33.size()!=0){
+                    projectDetailsVo.setProjectSupervisionLog(vo33.get(0));
+                }
+            }
 
+        }
+        js1.setRecords(projectDetailsVos);
+        js2.setData(js1);
+        return js2;
+    }
+    @ApiOperation("跳转项目详情页面")
+    @PostMapping("/loginTZ")
+    public ResultBean loginTZ(){
+        ResultBean rb=new ResultBean();
+        Map<String,Object> map=new HashMap<>();
+        LoginVo vo=ShRequester.loginTZ();
+        return rb.success().setData(vo);
+    }
 
     @ApiOperation("dingshi")
     @GetMapping("/rr")
     @Scheduled(cron = "1 0 0 * * ? ")
     public void rr(){
-        List<ProjectInfo> projectInfoLists=crmMapper.getProjectcs("0d19bc72-9370-45d3-bfda-5662eab34e4b");
-        List<ProjectInfo> projectInfo1=crmMapper.getNodeValue("0d19bc72-9370-45d3-bfda-5662eab34e4b");
-        for (ProjectInfo info : projectInfo1) {
-            ProjectPhaseRecordDto dto=new ProjectPhaseRecordDto();
-            SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-            dto.setOrderDate(sdf.format(new Date()).toString());
-            dto.setEnterpriseSid(info.getEnterpriseSid());
-            dto.setNodeKey(info.getNodeKey());
-            dto.setNodeValue(info.getNodeValue());
-            for (ProjectInfo projectInfoList : projectInfoLists) {
-                if(StringUtils.isNotBlank(projectInfoList.getNodeValue())){
-                    if(info.getNodeValue().equals(projectInfoList.getNodeValue())){
-                        dto.setTotal(dto.getTotal().add(projectInfoList.getUseLimitN()));
-                    }
+        //山海系统
+        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";
+        IndexQuery query =new IndexQuery();
+        query.setPage("1");
+        query.setLimit("1000");
+        query.setOrder_type("10");
+        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);
                 }
             }
-            projectPhaseRecordFeign.save(dto);
+            ztzCount=ztzCount+vos.getData().getCount();
+        }
+        //商享通
+        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);
+        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(new Date());
+        dto.setEnterpriseSid("0d19bc72-9370-45d3-bfda-5662eab34e4b");
+    }
+
+
+    @ApiOperation("获取客户")
+    @PostMapping("/getSuppliserInfo")
+    public ResultBean getSuppliserInfo(@RequestBody DataCenterQuery query){
+        ResultBean rb=new ResultBean();
+        A c =new A();
+        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.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);
+    }
+    @ApiOperation("获取供应商")
+    @PostMapping("/getCustomerInfo")
+    public ResultBean getCustomerInfo(@RequestBody DataCenterQuery query){
+        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);
+        //        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);
     }
 }

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

@@ -1,10 +1,14 @@
 package com.yxt.supervise.report.biz.datacenter;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.supervise.report.ds.crm.ShCreditBalanceCrmVo;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -30,12 +34,16 @@ public class ProjectDetailsVo {
     private String goodsDetail;
     private String tbdate;//放款日期
     private BigDecimal money=new BigDecimal(0);//用信金额
-    private String expectedCompletionDate;//预计完工日期
-    private String expectedDeliveryDate;//预计到货日期
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date expectedCompletionDate;//预计完工日期
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date expectedDeliveryDate;//预计到货日期
     private String creditNature;//用信性质
     private String creditStage;//用信阶段
     private BigDecimal hkMoney=new BigDecimal(0);
 //    List<ShCreditBalanceCrmVo> creditList =new ArrayList<>();
     List<ProjectEngineeringProgressVo> projectEngineeringList=new ArrayList<>();
+    ProjectEngineeringProgressVo projectEngineeringProgress=new ProjectEngineeringProgressVo();
     List<ProjectSupervisionLogVo> projectSupervisionLogList=new ArrayList<>();
+    ProjectSupervisionLogVo projectSupervisionLog=new ProjectSupervisionLogVo();
 }

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

@@ -1,15 +1,28 @@
 package com.yxt.supervise.report.biz.datacenter;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.vo.Vo;
 import lombok.Data;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2023/7/19 15:37
  */
 @Data
 public class ProjectEngineeringProgressVo implements Vo {
+    private String sid;
     private String projectSid;
-    private String orderDate;//日期
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date orderDate;//日期
     private String progressDescription;//进度
+    private String nextStage;//下阶段
+    private String remarks;//备注
+    private List<UrlsVo> urls=new ArrayList<>();
+
 }

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

@@ -1,16 +1,26 @@
 package com.yxt.supervise.report.biz.datacenter;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.base.utils.StringUtils;
 import lombok.Data;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2024/10/18 16:11
  */
 @Data
 public class ProjectSupervisionLogVo {
+    private String sid;
     private String projectSid;
-    private String orderDate;//日期
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date orderDate;//日期
     private String regulatoryWork;//监管工作
     private String workArrangement;//下一步工作安排
     private String remarks;//备注
+    private List<UrlsVo> urls=new ArrayList<>();
 }

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

@@ -0,0 +1,17 @@
+package com.yxt.supervise.report.biz.datacenter;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author wangpengfei
+ * @date 2024/10/22 16:22
+ */
+@Data
+public class ShGmVo {
+    private BigDecimal ztz=new BigDecimal(0);
+    private Integer ztzCount=0;
+    private BigDecimal dkzc=new BigDecimal(0);
+    private Integer dkzcCount=0;
+}

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

@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.report.biz.datacenter;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-base(供应商管理) <br/>
+ * File: BaseSupplierInfoVo.java <br/>
+ * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoVo <br/>
+ * Description: 供应商信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-18 13:33:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "供应商信息 视图数据对象", description = "供应商信息 视图数据对象")
+public class SupplierInfoVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
+    @ApiModelProperty("供应商类型")
+    private String supplierTypeName;
+    @ApiModelProperty("详细地址")
+    private String address;
+    @ApiModelProperty("电话")
+    private String contactTelePhone;
+    @ApiModelProperty("联系人")
+    private String contactName;
+    @ApiModelProperty("手机")
+    private String contactMobile;
+    private String useOrgSid;
+    private String createOrgSid;//创建组织sid
+    private String userSid;
+    private String orgPath;
+    private double taxRate;
+    private String remarks;
+}

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

@@ -0,0 +1,15 @@
+package com.yxt.supervise.report.biz.datacenter;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/10/21 10:39
+ */
+@Data
+public class UrlsVo {
+    private String name;
+    private String absolutePath;
+    private String url;
+    private String mainSid;
+}

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

@@ -1,10 +1,14 @@
 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.mapper.BaseMapper;
-import com.yxt.supervise.report.biz.datacenter.ProjectEngineeringProgressVo;
-import com.yxt.supervise.report.biz.datacenter.ProjectSupervisionLogVo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.report.biz.datacenter.*;
+import com.yxt.supervise.report.biz.projectfiles.UrlVo;
 import com.yxt.supervise.report.ds.warehouse.StoreHouse;
+import com.yxt.supervise.report.shanhai.req.IndexQuery;
 import org.apache.ibatis.annotations.*;
 
 import java.math.BigDecimal;
@@ -169,8 +173,19 @@ public interface CrmMapper extends BaseMapper<ProjectInfo> {
     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}")
+    @Select("select * from project_engineering_progress where projectSid=#{projectSid} order by orderDate desc")
     List<ProjectEngineeringProgressVo> getEngineeringByProject(@Param("projectSid") String projectSid);
-    @Select("select * from project_supervision_log where projectSid=#{projectSid}")
+    @Select("select * from project_supervision_log where projectSid=#{projectSid} order by orderDate desc")
     List<ProjectSupervisionLogVo> getLogByProject(@Param("projectSid") String projectSid);
+    @Select("select * from project_sh_gm where orderDate like CONCAT('%',#{orderDate},'%')")
+    ShGmVo getGm(@Param("orderDate") String orderDate);
+
+    List<String> getProjectPageList( @Param(Constants.WRAPPER) Wrapper<IndexQuery> qw);
+    @Select("select nodeValue from project_phase where projectSid=#{projectSid}")
+    String getNodeValueByProjectSid( @Param("projectSid")String projectSid);
+
+    @Select("select * from project_supervision_log_file where mainSid=#{mainSid}")
+    List<UrlsVo> getSupervisionLogFile(@Param("mainSid") String mainSid);
+    @Select("select * from project_engin_prog_file where mainSid=#{mainSid}")
+    List<UrlsVo> getEnginProgFile(@Param("mainSid") String mainSid);
 }

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

@@ -0,0 +1,20 @@
+<?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.report.ds.crm.CrmMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+    <select id="getProjectPageList" resultType="String">
+        SELECT
+        distinct d.shSid
+        FROM
+        project_information a
+        LEFT JOIN enterprise_project b ON b.projectSid = a.sid
+        left join project_phase c on c.projectSid=a.sid
+        left join storehouse_project d on d.projectSid=a.sid
+        left join project_credit_balance e on e.projectSid=a.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+</mapper>

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

@@ -3,6 +3,7 @@ package com.yxt.supervise.report.ds.crm;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @author wangpengfei
@@ -18,8 +19,8 @@ public class ShCreditBalanceCrmVo {
     private String projectname;
     private String enterpriseSid;
     private String enterpriseName;
-    private String expectedCompletionDate;//预计完工日期
-    private String expectedDeliveryDate;//预计到货日期
+    private Date expectedCompletionDate;//预计完工日期
+    private Date expectedDeliveryDate;//预计到货日期
     private String creditNature;//用信性质
     private String creditStage;//用信阶段
     private String pzfile;

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectshgm/ProjectShGmDto.java

@@ -0,0 +1,22 @@
+package com.yxt.supervise.report.feign.crm.projectshgm;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class ProjectShGmDto implements Dto {
+    private String sid;
+    private Date orderDate;
+    private BigDecimal ztz;
+    private Integer ztzCount;
+    private BigDecimal dkzc;
+    private Integer dkzcCount;
+    private String enterpriseSid;
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectshgm/ProjectShGmFeign.java

@@ -0,0 +1,25 @@
+package com.yxt.supervise.report.feign.crm.projectshgm;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.report.feign.crm.projectstatedictionary.ProjectStateDictionaryVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/15 11:40
+ */
+@FeignClient(
+        contextId = "supervise-crm-projectshgm",
+        name = "supervise-crm",
+        path = "v1/projectshmm")
+public interface ProjectShGmFeign {
+    @ApiOperation("保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody ProjectShGmDto dto);
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/ShHttp.java

@@ -0,0 +1,94 @@
+package com.yxt.supervise.report.shanhai;
+
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.crypto.asymmetric.KeyType;
+import cn.hutool.crypto.asymmetric.RSA;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.json.JSONUtil;
+import com.sun.istack.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.Assert;
+
+import java.util.Map;
+
+public class ShHttp {
+    private static final Logger L = LoggerFactory.getLogger(ShHttp.class);
+
+    private static final String RSA_PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1Z/+Bslu203UtutmzMW/" +
+            "FqS9bQvaMXQHgvU+ilNR5Hm2IZZalBWPoSbCGzlCUA19C3X6T17X09OMa6aDPKBm" +
+            "F6yXvUI7E/nWM9qUJ5hj4zVO/9GoH03WUyCWSBQg4f+LcnLS75v8nI6moOJ5ILkH" +
+            "mg2KNbEdx55UWjSqBatEopnLWtMFDGZswEbKBH3e2yalK6ddh2kUrtcuQGqFYm/u" +
+            "ViAOV+KoptwY2MCNSRLKYE4pCA2BCit7nr3EqNZRqqhKaOE44iyv45zCFrllx3nn" +
+            "wF3X/l+rR4G7Vc7HZwiqKF3RXl9PqmTLJkzhdpAdQX/Kr3SRRHsv/DzKjAZr/2jK" +
+            "rQIDAQAB";
+//    private static final String RSA_KEY = "sJI8PuGweKztQ6nLgp3dqcwljdKGFjPBD3XyUqCFsVG8rYhAIbD2AkNIKaefbjOB";//测试key
+    private static final String RSA_KEY = "dshigFSuey3iugsEUfghscwljdKGFjPBD3XyUqCFsVG8rYhAIbD2AkNIKaefbjOB";//正式key
+    private static final String RSA_KEY_MD5 = SecureUtil.md5(RSA_KEY);
+    private static final RSA RSA_OBJ = new RSA(null, RSA_PUBLIC_KEY);
+
+    //    private static String baseUrl = "http://hf-service.tiefaos.com";
+//    private static String baseUrl = "http://hf.lx-obj.top";//测试服务器
+    private static String baseUrl = "https://hf-service.shanhainengyuan.com";//正式服务器
+
+    public static String doGet(String apiUrl, Map<String, Object> params) {
+        String url = baseUrl + apiUrl;
+        HttpRequest httpRequest = HttpRequest.get(url);
+        HttpRequest request = fillHeaders(httpRequest);
+        String body = request.form(params)
+                .execute()
+                .body();
+
+        L.info("山海Get请求接口：{}###参数：{}###返回值：{}", apiUrl, params, body);
+        return body;
+    }
+
+
+    public static String dopost(String apiUrl, Map<String, Object> map) {
+        String url = baseUrl + apiUrl;
+        String bodyJson = JSONUtil.toJsonStr(map);
+        HttpRequest httpRequest = HttpRequest.post(url);
+        HttpRequest request = fillHeaders(httpRequest);
+//        String body = request.form(params)
+        String body = request.body(bodyJson)
+                .execute()
+                .body();
+
+        L.info("山海Post请求接口：{}###参数：{}###返回值：{}", apiUrl, bodyJson, body);
+        return body;
+    }
+
+    private static HttpRequest fillHeaders(@NotNull HttpRequest httpRequest) {
+        Assert.notNull(httpRequest);
+        if (httpRequest == null)
+            return null;
+
+        String date = headerDate();
+        String data = headerData(date);
+        return httpRequest
+                .header("date", date)
+                .header("data", data)
+                .header("identity","system");
+    }
+
+    private static String headerData(String date) {
+
+//        String res = "jiq07RIXsX/YwIkXCK4VdhIZcnuFHd+ERekZzMdZT7yxGAyON4s/qtJeJcG9z6uJMtqSUKWTvREc4CNsyuStXacJ2bGgKCzFc" +
+//                "UTwwBUJ7AQ2ybhedpkA7JWqJ1UjooLGUYZfoTduygH2r7LG0qRgigQGD3WdB53WLuC11kT5wAzMnFtbBDHpH78oNjGhvmWpa" +
+//                "R6meDCI2OM0GtCWwBxOagCYt8V5DfD47VyNHYn0xFRva4GFBF6K19061h1cu68eXxfIZj+clMweGlICgeXhktq8Z1T0Xmbah" +
+//                "FjhyTmdXuRxZBeQkLsot00XJHwQ48B6Z/VdOPpqoD95NTngRdV3+A=="; // 测试数据
+
+//        String val = RSA_KEY + date + RSA_KEY_MD5;
+//        String val = StrUtil.format("{}{}{}", RSA_KEY, date, RSA_KEY_MD5);
+        String val = new StringBuilder(RSA_KEY).append(date).append(RSA_KEY_MD5).toString();
+        String res = RSA_OBJ.encryptBase64(val, KeyType.PublicKey);
+        return res;
+    }
+
+
+    private static String headerDate() {
+        String res = "" + (System.currentTimeMillis() / 1000);
+//        res = "1683516744"; // 测试数据
+        return res;
+    }
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/ShRequester.java

@@ -0,0 +1,113 @@
+package com.yxt.supervise.report.shanhai;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.yxt.supervise.report.biz.datacenter.A;
+import com.yxt.supervise.report.shanhai.req.*;
+import com.yxt.supervise.report.shanhai.resp.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ShRequester {
+
+
+    private static String screen$enterprise$index = "/api/screen/enterprise/index"; //工商业数据大屏
+    private static String system$order$index = "/api/system/order/index"; //工商业数据大屏
+    private static String system$index$login = "/api/system/index/login"; //工商业数据大屏
+    /**
+     * 1.工商业数据大屏
+     *
+     * @return
+     */
+    public static IndexVo getscreen$enterprise$index(IndexQuery reqParams) {
+        Map<String, Object> param = null;
+        A c =new A();
+        if (reqParams != null)
+            param = BeanUtil.beanToMap(reqParams);
+        BaseResponse<BaseResponseListObj<IndexVo>> resp = new BaseResponse<>();
+        String s = ShHttp.doGet(screen$enterprise$index, param);
+        JSONObject jsonObject=new JSONObject(s);
+        IndexVo applyMaterial = JSONUtil.toBean(jsonObject, IndexVo.class);
+
+        return applyMaterial;
+    }
+    public static BaseResponse<BaseResponseListObj<OrderIndexVo>> getsystem$order$index(IndexQuery reqParams) {
+        BaseResponse<BaseResponseListObj<OrderIndexVo>> resp = new BaseResponse<>();
+        BaseResponseListObj<OrderIndexVo> respObj = new BaseResponseListObj<>();
+        Map<String, Object> param = null;
+        if (reqParams != null)
+            param = BeanUtil.beanToMap(reqParams);
+        String s = ShHttp.dopost(system$order$index, param);
+        BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, resp, respObj);
+        List<JSONObject> list = baseResponse.getData().getList();
+        List<OrderIndexVo> outStocks = new ArrayList<>();
+        for (JSONObject jsonObject : list) {
+            OrderIndexVo outStock = JSONUtil.toBean(jsonObject, OrderIndexVo.class);
+            outStocks.add(outStock);
+        }
+        respObj.setList(outStocks);
+        resp.setData(respObj);
+        return resp;
+    }
+    //        BaseResponse<BaseResponseListObj<OutStock>> resp = new BaseResponse<>();
+    //        BaseResponseListObj<OutStock> respObj = new BaseResponseListObj<>();
+    //        Map<String, Object> param = null;
+    //        if (reqParams != null)
+    //            param = BeanUtil.beanToMap(reqParams);
+    //        String s = ShHttp.doGet(out_stock$index, param);
+    //        BaseResponse<BaseResponseListObj<JSONObject>> baseResponse = toBean(s, resp, respObj);
+    //        List<JSONObject> list = baseResponse.getData().getList();
+    //        List<OutStock> outStocks = new ArrayList<>();
+    //        for (JSONObject jsonObject : list) {
+    //            OutStock outStock = JSONUtil.toBean(jsonObject, OutStock.class);
+    //            outStocks.add(outStock);
+    //        }
+    //        respObj.setList(outStocks);
+    //        resp.setData(respObj);
+    public static LoginVo loginTZ() {
+        String a ="https://hf-service.shanhainengyuan.com/api/system/index/login";
+        Map<String, Object> param = new HashMap<>();
+        A c =new A();
+        param.put("identity","system");
+        param.put("login_type","user");
+        param.put("password","888888");
+        param.put("username","汇融银行");
+        String s = ShHttp.dopost(system$index$login, param);
+        JSONObject jsonObject=new JSONObject(s);
+        LoginVo applyMaterial = JSONUtil.toBean(jsonObject, LoginVo.class);
+
+        return applyMaterial;
+    }
+
+    /**
+     * @return com.yxt.supervise.gf.shanhai.resp.BaseResponse
+     * @Description //描述： 将Json格式数据封装成统一返回对象
+     * @Param [s, resp, respObj]
+     **/
+    private static BaseResponse toBean(String s, BaseResponse resp, BaseResponseListObj respObj) {
+        JSONObject jsonObject = JSONUtil.parseObj(s);
+        String code = jsonObject.get("code").toString();
+        String msg = jsonObject.get("msg").toString();
+        resp.setCode(Integer.parseInt(code));
+        resp.setMsg(msg);
+        try {
+            JSONObject data = (JSONObject) jsonObject.get("data");
+            BaseResponseListObj listObj = JSONUtil.toBean(data, BaseResponseListObj.class);
+            List list = listObj.getList();
+            respObj.setList(list);
+            respObj.setCount(listObj.getCount());
+            resp.setData(respObj);
+        } catch (Exception e) {
+            Boolean a = jsonObject.get("data").toString().equals("null") || jsonObject.get("data") == null;
+            List data = a ? null : (List) jsonObject.get("data");
+            respObj.setList(data);
+            resp.setData(respObj);
+        }
+        return resp;
+    }
+
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/req/IndexQuery.java

@@ -0,0 +1,26 @@
+package com.yxt.supervise.report.shanhai.req;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+@Data
+public class IndexQuery implements Query {
+
+    private String year; // 	年
+    private String month; // 	月
+    private String day; // 	日
+    private String date; //日期
+
+//----------------------------------
+    private String limit;
+    private String order_type;
+    private String page;
+    private String workflow;
+//--------------------------------------
+    private String nodeValue;//在建  在途 竣工
+    private String projectSid;//
+    private String warehouseName;
+    private String address;
+    private String warehouseCode;
+    private String creditNature;
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/BaseResponse.java

@@ -0,0 +1,12 @@
+package com.yxt.supervise.report.shanhai.resp;
+
+import lombok.Data;
+
+@Data
+public class BaseResponse<T> {
+
+    //{"code":404,"msg":"header参数验证错误","data":null}
+    private int code;
+    private String msg;
+    private T data;
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/BaseResponseListObj.java

@@ -0,0 +1,12 @@
+package com.yxt.supervise.report.shanhai.resp;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BaseResponseListObj<T> {
+
+    private List<T> list;
+    private Integer count;
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/IndexVo.java

@@ -0,0 +1,19 @@
+package com.yxt.supervise.report.shanhai.resp;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "待配货列表")
+public class IndexVo {
+
+
+    private String enterprise_month; // 月
+    private String enterprise_year; // 年,
+    private String enterprise_day; //日
+    private List<NearVo> near_day; // "",
+
+
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/LoginVo.java

@@ -0,0 +1,12 @@
+package com.yxt.supervise.report.shanhai.resp;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/10/21 16:45
+ */
+@Data
+public class LoginVo {
+    private String token;
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/NearVo.java

@@ -0,0 +1,15 @@
+package com.yxt.supervise.report.shanhai.resp;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author wangpengfei
+ * @date 2024/10/21 15:25
+ */
+@Data
+public class NearVo {
+    private String name;
+    private BigDecimal enterprise_power=new BigDecimal(0);//
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/OrderIndexVo.java

@@ -0,0 +1,12 @@
+package com.yxt.supervise.report.shanhai.resp;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/10/22 15:15
+ */
+@Data
+public class OrderIndexVo {
+    private  String all_power;
+}