合伙招商后台

src/main/java/com/partner/admin/VO/HomePageInfoVO.java

+package com.partner.admin.VO;
+
+import com.partner.admin.domain.PartnerImageSource;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ */
+@Data
+@ApiModel(value = "返回未登陆时首页轮播图，统计数信息")
+public class HomePageInfoVO implements Serializable {
+
+    @ApiModelProperty(value = "轮播图")
+    private List<PartnerImageSource> partnerImageSourceList = new ArrayList<>();
+
+    @ApiModelProperty(value = "平台项目统计")
+    private PlatformProjectStatisticsVO platformProjectStatisticsVO = new PlatformProjectStatisticsVO();
+
+    @ApiModelProperty(value = "我的项目统计")
+    private PersonalStatisticsVO personalStatisticsVO = new PersonalStatisticsVO();
+
+    @ApiModelProperty(value = "待办事项统计")
+    private Long todoCount = 0l;
+
+    @ApiModelProperty(value = "我的收益统计")
+    private PersonalIncomeInfoVO personalIncomeInfoVO = new PersonalIncomeInfoVO();
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

src/main/java/com/partner/admin/VO/MyPartnerProjectInfoVO.java

+package com.partner.admin.VO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 
+ * @TableName partner_project_info
+ */
+@Data
+@ApiModel(value="我的项目")
+public class MyPartnerProjectInfoVO implements Serializable {
+
+    @ApiModelProperty(value = "审核中项目列表")
+    private List<PartnerProjectInfoListVO> examineProjectList = new ArrayList<>();
+    @ApiModelProperty(value = "推进中项目列表")
+    private List<PartnerProjectInfoListVO> pushProjectList = new ArrayList<>();
+    @ApiModelProperty(value = "分配中项目列表")
+    private List<PartnerProjectInfoListVO> allocationProjectList = new ArrayList<>();
+    @ApiModelProperty(value = "草稿箱项目列表")
+    private List<PartnerProjectInfoListVO> saveProjectList = new ArrayList<>();
+    @ApiModelProperty(value = "我的项目统计")
+    private PersonalStatisticsVO personalStatistics = new PersonalStatisticsVO();
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

src/main/java/com/partner/admin/VO/PartnerAllocationDetailVO.java

+package com.partner.admin.VO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 
+ */
+@Data
+@ApiModel(value="分配中内容详情")
+public class PartnerAllocationDetailVO implements Serializable {
+    /**
+     * 
+     */
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
+    /**
+     * 投资主体
+     */
+    @ApiModelProperty(value = "投资主体")
+    private String investmentSubject;
+
+    /**
+     * 投资总额
+     */
+    @ApiModelProperty(value = "推进区域")
+    private BigDecimal pushArea;
+
+    /**
+     * 固定资产投资总额
+     */
+    @ApiModelProperty(value = "佣金比例")
+    private BigDecimal commissionRatio;
+
+    /**
+     * 0-暂存 1-信息提报 2-项目查重通过 3-项目查重拒绝 4-招商公司匹配 5-企业对接 6-投资意向确认 7-确认项目信息 8-完成审核 9-项目信息 10-项目沟通 11-区域匹配  12-政企互访 13-项目谈判  14-项目签约 15-分配中 20-作废
+     */
+//    @ApiModelProperty(hidden = true)
+//    private Integer status;
+
+    /**
+     * 0-暂存 1-信息提报 2-项目查重通过 3-项目查重拒绝 4-招商公司匹配 5-企业对接 6-投资意向确认 7-确认项目信息 8-完成审核 9-项目信息 10-项目沟通 11-区域匹配  12-政企互访 13-项目谈判  14-项目签约 15-分配中 20-作废
+     */
+//    @ApiModelProperty(hidden = true)
+//    private String statusDescription;
+
+    /**
+     * 匹配招商公司
+     */
+    @ApiModelProperty(value = "区域负责人")
+    private String areaPerson;
+
+    @ApiModelProperty(value = "区域负责人联系方式")
+    private String areaPersonPhone;
+
+    /**
+     * 匹配招商公司
+     */
+    @ApiModelProperty(value = "匹配招商公司")
+    private String investmentPromotionCompany;
+
+    @ApiModelProperty(value = "匹配招商公司联系方式")
+    private String phone;
+
+
+    /**
+     * 投资总额
+     */
+    @ApiModelProperty(value = "投资总额")
+    private BigDecimal projectInvestmentTotal;
+
+    /**
+     * 固定资产投资总额
+     */
+    @ApiModelProperty(value = "固定资产投资总额")
+    private BigDecimal projectInvestmentRegular;
+
+    /**
+     * 投资总额
+     */
+    @ApiModelProperty(value = "一期投资总额")
+    private BigDecimal oneProjectInvestmentTotal;
+
+    /**
+     * 固定资产投资总额
+     */
+    @ApiModelProperty(value = "一期固定资产投资总额")
+    private BigDecimal oneProjectInvestmentRegular;
+
+    /**
+     * 0-项目查重确认 1-确认项目所属 2-确认佣金比例
+     */
+//    @ApiModelProperty(value = "0-项目查重确认 1-确认项目所属 2-确认佣金比例")
+//    private Integer todoStatus;
+
+    /**
+     * 0-项目查重确认 1-确认项目所属 2-确认佣金比例
+     */
+//    @ApiModelProperty(value = "0-项目查重确认 1-确认项目所属 2-确认佣金比例")
+//    private String todoStatusDescription;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

src/main/java/com/partner/admin/VO/PartnerAllocationProjectInfoVO.java

+package com.partner.admin.VO;
+
+import com.partner.admin.domain.PartnerProjectStatusChangeLog;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 
+ */
+@Data
+@ApiModel(value="项目信息")
+public class PartnerAllocationProjectInfoVO implements Serializable {
+
+    @ApiModelProperty(value = "分配中内容详情")
+    private PartnerAllocationDetailVO partnerAllocationDetail;
+
+    @ApiModelProperty(value = "审核节点")
+    private List<PartnerProjectStatusChangeLog> partnerProjectStatusChangeLogs;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

src/main/java/com/partner/admin/VO/PartnerExamineDetailVO.java

+package com.partner.admin.VO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 
+ */
+@Data
+@ApiModel(value="审核中内容详情")
+public class PartnerExamineDetailVO implements Serializable {
+    /**
+     * 
+     */
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
+    /**
+     * 投资主体
+     */
+    @ApiModelProperty(value = "投资主体")
+    private String investmentSubject;
+
+    /**
+     * 投资总额
+     */
+    @ApiModelProperty(value = "投资总额")
+    private BigDecimal projectInvestmentTotal;
+
+    /**
+     * 固定资产投资总额
+     */
+    @ApiModelProperty(value = "固定资产投资总额")
+    private BigDecimal projectInvestmentRegular;
+
+    /**
+     * 0-暂存 1-信息提报 2-项目查重通过 3-项目查重拒绝 4-招商公司匹配 5-企业对接 6-投资意向确认 7-确认项目信息 8-完成审核 9-项目信息 10-项目沟通 11-区域匹配  12-政企互访 13-项目谈判  14-项目签约 15-分配中 20-作废
+     */
+//    @ApiModelProperty(hidden = true)
+//    private Integer status;
+
+    /**
+     * 0-暂存 1-信息提报 2-项目查重通过 3-项目查重拒绝 4-招商公司匹配 5-企业对接 6-投资意向确认 7-确认项目信息 8-完成审核 9-项目信息 10-项目沟通 11-区域匹配  12-政企互访 13-项目谈判  14-项目签约 15-分配中 20-作废
+     */
+//    @ApiModelProperty(hidden = true)
+//    private String statusDescription;
+
+    /**
+     * 匹配招商公司
+     */
+    @ApiModelProperty(value = "匹配招商公司")
+    private String investmentPromotionCompany;
+
+    /**
+     * 0-项目查重确认 1-确认项目所属 2-确认佣金比例
+     */
+//    @ApiModelProperty(value = "0-项目查重确认 1-确认项目所属 2-确认佣金比例")
+//    private Integer todoStatus;
+
+    /**
+     * 0-项目查重确认 1-确认项目所属 2-确认佣金比例
+     */
+//    @ApiModelProperty(value = "0-项目查重确认 1-确认项目所属 2-确认佣金比例")
+//    private String todoStatusDescription;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

src/main/java/com/partner/admin/VO/PartnerExamineProjectInfoVO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.partner.admin.domain.PartnerProjectStatusChangeLog;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -11,62 +12,20 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 
- * @TableName partner_project_info
  */
 @Data
 @ApiModel(value="项目信息")
 public class PartnerExamineProjectInfoVO implements Serializable {
-    /**
-     * 
-     */
-    @ApiModelProperty(hidden = true)
-    private Integer id;
-
-    /**
-     * 投资主体
-     */
-    @ApiModelProperty(value = "投资主体")
-    private String investmentSubject;
-
-    /**
-     * 投资总额
-     */
-    @ApiModelProperty(value = "投资总额")
-    private BigDecimal projectInvestmentTotal;
-
-    /**
-     * 固定资产投资总额
-     */
-    @ApiModelProperty(value = "固定资产投资总额")
-    private BigDecimal projectInvestmentRegular;
-
-    /**
-     * 0-暂存 1-信息提报 2-项目查重通过 3-项目查重拒绝 4-招商公司匹配 5-企业对接 6-投资意向确认 7-确认项目信息 8-完成审核 9-项目信息 10-项目沟通 11-区域匹配  12-政企互访 13-项目谈判  14-项目签约 15-分配中 20-作废
-     */
-    @ApiModelProperty(hidden = true)
-    private Integer status;
 
-    /**
-     * 0-暂存 1-信息提报 2-项目查重通过 3-项目查重拒绝 4-招商公司匹配 5-企业对接 6-投资意向确认 7-确认项目信息 8-完成审核 9-项目信息 10-项目沟通 11-区域匹配  12-政企互访 13-项目谈判  14-项目签约 15-分配中 20-作废
-     */
-    @ApiModelProperty(hidden = true)
-    private String statusDescription;
+    @ApiModelProperty(value = "审核中内容详情")
+    private PartnerExamineDetailVO partnerExamineDetail;
 
-    /**
-     * 匹配招商公司
-     */
-    @ApiModelProperty(value = "匹配招商公司")
-    private String investmentPromotionCompany;
-
-    /**
-     * 0-项目查重确认 1-确认项目所属 2-确认佣金比例
-     */
-    @ApiModelProperty(hidden = true)
-    private Integer todoStatus;
+    @ApiModelProperty(value = "审核节点")
+    private List<PartnerProjectStatusChangeLog> partnerProjectStatusChangeLogs;
 
-    @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

src/main/java/com/partner/admin/VO/PartnerImageSourceVO.java

+package com.partner.admin.VO;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * @TableName partner_image_source
+ */
+@Data
+@ApiModel(value = "图片上传")
+public class PartnerImageSourceVO implements Serializable {
+    /**
+     * 
+     */
+    @ApiModelProperty(hidden = true)
+    private Integer id;
+
+    /**
+     * 
+     */
+    @ApiModelProperty(hidden = true)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 
+     */
+    @ApiModelProperty(hidden = true)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 图片url链接
+     */
+    @ApiModelProperty(value = "图片url链接")
+    private String imageUrl;
+
+    /**
+     * 0-禁用 1-正常
+     */
+//    @ApiModelProperty(value = "0-禁用 1-正常")
+    @ApiModelProperty(hidden = true)
+    private Integer status;
+
+    /**
+     * 项目 (1-合伙人管理/区域大纲 2-项目信息图片  3-对公账户营业执照)
+     */
+//    @ApiModelProperty(value = "项目 (1-合伙人管理/区域大纲 2-项目信息图片  3-对公账户营业执照)")
+    @ApiModelProperty(hidden = true)
+    private Integer objectType;
+
+    /**
+     * 1-没有id  2-project_Info_id 3-coporate_account_info_id 4-未登录首页轮播图 5-登录首页轮播图
+     */
+//    @ApiModelProperty(value = "1-没有id  2-project_Info_id 3-coporate_account_info_id")
+    @ApiModelProperty(hidden = true)
+    private Integer objectId;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty(value = "排序")
+    private Integer imageSort;
+
+    /**
+     * 
+     */
+    @ApiModelProperty(hidden = true)
+    private Integer tenantId;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

src/main/java/com/partner/admin/VO/PartnerProjectInfoListVO.java

+package com.partner.admin.VO;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 
+ * @TableName partner_project_info
+ */
+@Data
+@ApiModel(value="项目信息列表")
+public class PartnerProjectInfoListVO implements Serializable {
+
+
+    @ApiModelProperty(value = "项目id")
+    private Integer id;
+
+    /**
+     * 投资主体
+     */
+    @ApiModelProperty(value = "投资主体")
+    private String investmentSubject;
+
+    /**
+     * 产业知道项目名称
+     */
+    @ApiModelProperty(value = "项目名称")
+    private String projectName;
+
+
+    /**
+     * 产业知道匹配招商公司code
+     */
+    @ApiModelProperty(value = "匹配招商公司code")
+    private String orgCode;
+
+    /**
+     * 产业知道匹配招商公司
+     */
+    @ApiModelProperty(value = "匹配招商公司")
+    private String orgName;
+
+    /**
+     * 项目联系人电话
+     */
+    @ApiModelProperty(value = "项目联系人电话")
+    private String phone;
+    /**
+     * 0-暂存 1-信息提报 2-项目查重通过 3-项目查重拒绝 4-招商公司匹配 5-企业对接 6-投资意向确认 7-确认项目信息 8-完成审核 9-项目信息 10-项目沟通 11-区域匹配  12-政企互访 13-项目谈判  14-项目签约 15-分配中 20-作废
+     */
+//    @ApiModelProperty(hidden = true)
+    @ApiModelProperty(value = "0-暂存 1-信息提报 2-项目查重 4-招商公司匹配 5-企业对接 6-投资意向确认 7-确认项目信息 8-完成审核 9-项目信息 10-项目沟通 11-区域匹配  12-政企互访 13-项目谈判  14-项目签约 15-分配中 20-作废")
+    private Integer status;
+
+    /**
+     * 0-暂存 1-信息提报 2-项目查重 4-招商公司匹配 5-企业对接 6-投资意向确认 7-确认项目信息 8-完成审核 9-项目信息 10-项目沟通 11-区域匹配  12-政企互访 13-项目谈判  14-项目签约 15-分配中 20-作废
+     */
+    @ApiModelProperty(value = "0-暂存 1-信息提报 2-项目查重 4-招商公司匹配 5-企业对接 6-投资意向确认 7-确认项目信息 8-完成审核 9-项目信息 10-项目沟通 11-区域匹配  12-政企互访 13-项目谈判  14-项目签约 15-分配中 20-作废")
+    private String statusDescription;
+
+    /**
+     * 0-项目查重确认 1-确认项目所属 2-确认佣金比例
+     */
+    @ApiModelProperty(value = "0-项目查重确认 1-确认项目所属 2-确认佣金比例")
+    private Integer todoStatus;
+
+    /**
+     * 0-项目查重确认 1-确认项目所属 2-确认佣金比例
+     */
+    @ApiModelProperty(value = "0-项目查重确认 1-确认项目所属 2-确认佣金比例")
+    private String todoStatusDescription;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

src/main/java/com/partner/admin/VO/PartnerProjectInfoVO.java

+package com.partner.admin.VO;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.partner.admin.domain.PartnerImageSource;
+import com.partner.admin.domain.PartnerProjectInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 
+ * @TableName partner_project_info
+ */
+@Data
+@ApiModel(value="项目信息")
+public class PartnerProjectInfoVO implements Serializable {
+
+    private PartnerProjectInfo partnerProjectInfo;
+    private List<PartnerImageSource> partnerImageSourceList;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

src/main/java/com/partner/admin/VO/PartnerPushDetailVO.java

+package com.partner.admin.VO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 
+ */
+@Data
+@ApiModel(value="审核中内容详情")
+public class PartnerPushDetailVO implements Serializable {
+    /**
+     * 
+     */
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
+    /**
+     * 投资主体
+     */
+    @ApiModelProperty(value = "投资主体")
+    private String investmentSubject;
+
+    /**
+     * 投资总额
+     */
+    @ApiModelProperty(value = "推进区域")
+    private BigDecimal pushArea;
+
+    /**
+     * 固定资产投资总额
+     */
+    @ApiModelProperty(value = "佣金比例")
+    private BigDecimal commissionRatio;
+
+    /**
+     * 0-暂存 1-信息提报 2-项目查重通过 3-项目查重拒绝 4-招商公司匹配 5-企业对接 6-投资意向确认 7-确认项目信息 8-完成审核 9-项目信息 10-项目沟通 11-区域匹配  12-政企互访 13-项目谈判  14-项目签约 15-分配中 20-作废
+     */
+//    @ApiModelProperty(hidden = true)
+//    private Integer status;
+
+    /**
+     * 0-暂存 1-信息提报 2-项目查重通过 3-项目查重拒绝 4-招商公司匹配 5-企业对接 6-投资意向确认 7-确认项目信息 8-完成审核 9-项目信息 10-项目沟通 11-区域匹配  12-政企互访 13-项目谈判  14-项目签约 15-分配中 20-作废
+     */
+//    @ApiModelProperty(hidden = true)
+//    private String statusDescription;
+
+    /**
+     * 匹配招商公司
+     */
+    @ApiModelProperty(value = "匹配招商公司")
+    private String investmentPromotionCompany;
+
+    /**
+     * 匹配招商公司联系方式
+     */
+    @ApiModelProperty(value = "匹配招商公司联系方式")
+    private String phone;
+
+    /**
+     * 投资总额
+     */
+    @ApiModelProperty(value = "投资总额")
+    private BigDecimal projectInvestmentTotal;
+
+    /**
+     * 固定资产投资总额
+     */
+    @ApiModelProperty(value = "固定资产投资总额")
+    private BigDecimal projectInvestmentRegular;
+
+    /**
+     * 投资总额
+     */
+    @ApiModelProperty(value = "一期投资总额")
+    private BigDecimal oneProjectInvestmentTotal;
+
+    /**
+     * 固定资产投资总额
+     */
+    @ApiModelProperty(value = "一期固定资产投资总额")
+    private BigDecimal oneProjectInvestmentRegular;
+
+    /**
+     * 0-项目查重确认 1-确认项目所属 2-确认佣金比例
+     */
+//    @ApiModelProperty(value = "0-项目查重确认 1-确认项目所属 2-确认佣金比例")
+//    private Integer todoStatus;
+
+    /**
+     * 0-项目查重确认 1-确认项目所属 2-确认佣金比例
+     */
+//    @ApiModelProperty(value = "0-项目查重确认 1-确认项目所属 2-确认佣金比例")
+//    private String todoStatusDescription;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

src/main/java/com/partner/admin/VO/PartnerPushProjectInfoVO.java

+package com.partner.admin.VO;
+
+import com.partner.admin.domain.PartnerProjectStatusChangeLog;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 
+ */
+@Data
+@ApiModel(value="项目信息")
+public class PartnerPushProjectInfoVO implements Serializable {
+
+    @ApiModelProperty(value = "推进中内容详情")
+    private PartnerPushDetailVO partnerPushDetailVODetail;
+
+    @ApiModelProperty(value = "审核节点")
+    private List<PartnerProjectStatusChangeLog> partnerProjectStatusChangeLogs;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

src/main/java/com/partner/admin/VO/PersonalIncomeInfoVO.java

+package com.partner.admin.VO;
+
+import com.partner.admin.domain.PartnerImageSource;
+import com.partner.admin.domain.PartnerProjectInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 
+ * @TableName partner_project_info
+ */
+@Data
+@ApiModel(value="我的收益统计")
+public class PersonalIncomeInfoVO implements Serializable {
+
+    @ApiModelProperty(value = "可提现佣金")
+    private BigDecimal withdrawnCommission = new BigDecimal(0.0);
+
+    @ApiModelProperty(value = "已提现佣金")
+    private BigDecimal alrealyWithdrawnCommission = new BigDecimal(0.0);
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

src/main/java/com/partner/admin/VO/HomePageLoginInfoVO.java → src/main/java/com/partner/admin/VO/PersonalStatisticsVO.java

 package com.partner.admin.VO;
 
-import com.partner.admin.domain.PartnerImageSource;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  *
  */
 @Data
-@ApiModel(value = "返回登陆时首页轮播图，统计数信息")
-public class HomePageLoginInfoVO implements Serializable {
+@ApiModel(value = "我的项目统计")
+public class PersonalStatisticsVO implements Serializable {
 
-    @ApiModelProperty(value = "轮播图")
-    private List<PartnerImageSource> partnerImageSourceList = new ArrayList<>();
     @ApiModelProperty(value = "总项目量")
     private Long projectAllCount = 0L;
     @ApiModelProperty(value = "总投资额")

src/main/java/com/partner/admin/VO/HomePageLogoutInfoVO.java → src/main/java/com/partner/admin/VO/PlatformProjectStatisticsVO.java

@@ -14,11 +14,10 @@ import java.util.List;
  *
  */
 @Data
-@ApiModel(value = "返回未登陆时首页轮播图，统计数信息")
-public class HomePageLogoutInfoVO implements Serializable {
+@ApiModel(value = "平台项目统计")
+public class PlatformProjectStatisticsVO implements Serializable {
+
 
-    @ApiModelProperty(value = "轮播图")
-    private List<PartnerImageSource> partnerImageSourceList = new ArrayList<>();
     @ApiModelProperty(value = "总项目量")
     private Long projectAllCount = 0L;
     @ApiModelProperty(value = "项目总投资额")

src/main/java/com/partner/admin/common/config/ResourceConfig.java

@@ -35,7 +35,7 @@ public class ResourceConfig implements WebMvcConfigurer {
                     "/webjars/**", "/v2/**","/v3/**", "/swagger-ui.html/**",
                     "/api", "/api-docs", "/api-docs/**", "/doc.html/**"};
             String[] excludeUrl = new String[]{"/weixin/**",
-            "/sysFile/**","/common/**"};
+            "/sysFile/**","/homePage/**"};
             String[] excludePatterns = (String[]) ArrayUtils.addAll(excludeSwagger, excludeUrl);
 
             System.out.println("自定义拦截器#############################################");

src/main/java/com/partner/admin/controller/BaseController.java

@@ -27,6 +27,25 @@ public class BaseController {
     @Autowired
     SysUserService sysUserService;
 
+    protected boolean isLogin() {
+        String token = ServletUtils.getRequest().getHeader("token");
+        QueryWrapper<Token> sysUserTokenQW = new QueryWrapper<>();
+        sysUserTokenQW.eq("token", token);
+        Token sysUserToken = tokenService.getOne(sysUserTokenQW);
+        if (ObjectUtils.isEmpty(sysUserToken)) {
+            return false;
+        }
+        //token过期
+        if(ObjectUtils.isNotEmpty(sysUserToken.getExpireTime())){
+            Date expireTime = sysUserToken.getExpireTime();
+            Date newDate = new Date();
+            if(newDate.after(expireTime)){
+                return false;
+            }
+        }
+        return true;
+    }
+
     protected SysUserVO getUserInfo(){
 
         String tokenStr = ServletUtils.getRequest().getHeader("token");
@@ -48,8 +67,8 @@ public class BaseController {
         sysUserVO.setUserName(sysUser.getUserName());
 
         //判断今天是否更新过token过期时间，没更新就去更新
-        if(ObjectUtils.isNotEmpty(token.getUpdateTime())){
-            Date updateTime = token.getUpdateTime();
+        if(ObjectUtils.isNotEmpty(token.getExpireTime())){
+            Date updateTime = token.getExpireTime();
             SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
             String data2 = sdf2.format(updateTime);
             Date date = new Date();

src/main/java/com/partner/admin/controller/CommonController.java → src/main/java/com/partner/admin/controller/HomePageController.java

 package com.partner.admin.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.partner.admin.VO.HomePageLoginInfoVO;
-import com.partner.admin.VO.HomePageLogoutInfoVO;
+import com.partner.admin.VO.PersonalStatisticsVO;
+import com.partner.admin.VO.HomePageInfoVO;
+import com.partner.admin.VO.PlatformProjectStatisticsVO;
 import com.partner.admin.domain.PartnerImageSource;
 import com.partner.admin.domain.PartnerProjectInfo;
 import com.partner.admin.service.PartnerImageSourceService;
 import com.partner.admin.service.PartnerProjectInfoService;
-import com.partner.admin.service.TokenService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,18 +16,16 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.math.BigDecimal;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 首页信息
  * @author yaobaizheng
  */
 @Controller
-@RequestMapping("/common")
+@RequestMapping("/homePage")
 @Api(tags = "首页信息返回")
-public class CommonController extends BaseController{
+public class HomePageController extends BaseController{
 
     @Autowired
     PartnerImageSourceService partnerImageSourceService;
@@ -35,38 +33,52 @@ public class CommonController extends BaseController{
     @Autowired
     PartnerProjectInfoService partnerProjectInfoService;
 
-    @PostMapping("/getLogOutHomePageInfo")
+
+    @PostMapping("/getHomePageInfo")
     @ResponseBody
-    @ApiOperation(value = "返回未登陆时首页轮播图，统计数信息",notes = "直接调用")
-    public HomePageLogoutInfoVO getLogOutHomePageInfo()  {
+    @ApiOperation(value = "首页轮播图，统计数信息",notes = "直接调用")
+    public HomePageInfoVO getHomePageInfo()  {
+
+        HomePageInfoVO homePageInfoVO = new HomePageInfoVO();
         //首页轮播图
         QueryWrapper<PartnerImageSource> pisQW = new QueryWrapper<PartnerImageSource>();
         pisQW.eq("object_type", 4);
         List<PartnerImageSource> pisList = partnerImageSourceService.list(pisQW);
+        homePageInfoVO.setPartnerImageSourceList(pisList);
 
         //本意只使用合伙人平台的数据，但是鉴于数据为空，暂时不好看，暂时借用产业知道的数据，下面的以后会删除
         // 统计数-总项目量+项目总投资额+项目总固定资产投资额+平台合伙人
-        HomePageLogoutInfoVO  homePageLogoutInfoVO = partnerProjectInfoService.getLogoutStatistics();
-        homePageLogoutInfoVO.setPartnerImageSourceList(pisList);
-
-        return homePageLogoutInfoVO;
-    }
-
+        PlatformProjectStatisticsVO platformProjectStatisticsVO = partnerProjectInfoService.getPlatformProjectStatistics();
+        homePageInfoVO.setPlatformProjectStatisticsVO(platformProjectStatisticsVO);
 
-    @PostMapping("/getLoginHomePageInfo")
-    @ResponseBody
-    @ApiOperation(value = "返回登陆时首页轮播图，统计数信息",notes = "直接调用")
-    public HomePageLoginInfoVO getLoginHomePageInfo()  {
-        //首页轮播图
-        QueryWrapper<PartnerImageSource> pisQW = new QueryWrapper<>();
-        pisQW.eq("object_type", 5);
-        List<PartnerImageSource> pisList = partnerImageSourceService.list(pisQW);
 
+        if(isLogin()){
             //统计数-总项目量+总投资额+审核中的项目+推进中的项目
-        HomePageLoginInfoVO homePageLoginInfoVO = partnerProjectInfoService.getLoginStatistics(getUserInfo().getUserId());
-        homePageLoginInfoVO.setPartnerImageSourceList(pisList);
+            PersonalStatisticsVO personalStatisticsVO = partnerProjectInfoService.getPersonalStatistics(getUserInfo().getUserId());
+            homePageInfoVO.setPersonalStatisticsVO(personalStatisticsVO);
+            //待办事项统计
+            QueryWrapper<PartnerProjectInfo> ppiQW = new QueryWrapper<>();
+            ppiQW.in("todo_status",0,1,2);
+            Long count = partnerProjectInfoService.count();
+            homePageInfoVO.setTodoCount(count);
+        }
 
-        return homePageLoginInfoVO;
+        return homePageInfoVO;
     }
 
+//
+//    @PostMapping("/getLoginHomePageInfo")
+//    @ResponseBody
+//    @ApiOperation(value = "返回登陆时首页轮播图，统计数信息",notes = "直接调用")
+//    public PersonalStatisticsVO getLoginHomePageInfo()  {
+//        //首页轮播图
+//        QueryWrapper<PartnerImageSource> pisQW = new QueryWrapper<>();
+//        pisQW.eq("object_type", 5);
+//        List<PartnerImageSource> pisList = partnerImageSourceService.list(pisQW);
+//
+//
+//
+//        return homePageLoginInfoVO;
+//    }
+
 }

src/main/java/com/partner/admin/controller/PartnerProjectController.java

 package com.partner.admin.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.partner.admin.VO.HomePageLoginInfoVO;
-import com.partner.admin.VO.HomePageLogoutInfoVO;
-import com.partner.admin.VO.PartnerExamineProjectInfoVO;
-import com.partner.admin.common.menu.PartnerProjectStatusEnum;
-import com.partner.admin.common.page.TableDataInfo;
-import com.partner.admin.domain.PartnerImageSource;
+import com.partner.admin.VO.*;
 import com.partner.admin.domain.PartnerProjectInfo;
 import com.partner.admin.service.PartnerImageSourceService;
 import com.partner.admin.service.PartnerProjectInfoService;
+import com.partner.admin.service.PartnerProjectStatusChangeLogService;
+import com.partner.admin.service.ProjectInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,8 +17,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.List;
-
 /**
  * 文件上传下载处理
  * @author yaobaizheng
@@ -36,99 +29,30 @@ public class PartnerProjectController extends BaseController{
     @Autowired
     PartnerProjectInfoService partnerProjectInfoService;
 
-    @PostMapping("/getPersonProjectStatistics")
-    @ResponseBody
-    @ApiOperation(value = "顶部个人数据概览",notes = "直接调用")
-    public HomePageLoginInfoVO getPersonProjectStatistics()  {
-        //统计数-总项目量+总投资额+审核中的项目+推进中的项目
-        HomePageLoginInfoVO homePageLoginInfoVO = partnerProjectInfoService.getLoginStatistics(getUserInfo().getUserId());
-        return homePageLoginInfoVO;
-    }
+    @Autowired
+    PartnerImageSourceService partnerImageSourceService;
 
-    @PostMapping("/getPersonExamineProjectList")
-    @ResponseBody
-    @ApiOperation(value = "审核中列表",notes = "")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "第几页（可为空，后台默认值：1）", type = "String"),
-            @ApiImplicitParam(name = "pageSize", value = "每页展示数据量（可为空，后台默认值：10）", type = "String"),
-            @ApiImplicitParam(name = "orderByColumn", value = "排序字段（可为空，传类属性）", type = "String"),
-            @ApiImplicitParam(name = "isAsc", value = "排序字段（可为空，请传asc或者desc）", type = "String")
-    })
-    public TableDataInfo getPersonExamineProjectList()  {
-        QueryWrapper<PartnerProjectInfo> ppiQW = new QueryWrapper<>();
-        ppiQW.in("status", 1,2,3,4,5,6,7,8);
-        List<PartnerProjectInfo> list = partnerProjectInfoService.list(ppiQW);
-        return getDataTable(list);
-    }
+    @Autowired
+    ProjectInfoService projectInfoService;
 
-    @PostMapping("/getPersonPushProjectList")
-    @ResponseBody
-    @ApiOperation(value = "推进中列表",notes = "直接调用")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "第几页（可为空，后台默认值：1）", type = "String"),
-            @ApiImplicitParam(name = "pageSize", value = "每页展示数据量（可为空，后台默认值：10）", type = "String"),
-            @ApiImplicitParam(name = "orderByColumn", value = "排序字段（可为空，传类属性）", type = "String"),
-            @ApiImplicitParam(name = "isAsc", value = "排序字段（可为空，请传asc或者desc）", type = "String")
-    })
-    public List<PartnerProjectInfo> getPersonPushProjectList()  {
-        QueryWrapper<PartnerProjectInfo> ppiQW = new QueryWrapper<>();
-        ppiQW.in("status", 9,10,11,12,13,14);
-        return partnerProjectInfoService.list(ppiQW);
-    }
+    @Autowired
+    PartnerProjectStatusChangeLogService changeLogService;
 
-    @PostMapping("/getPersonAllocationProjectList")
-    @ResponseBody
-    @ApiOperation(value = "分配中列表",notes = "直接调用")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "第几页（可为空，后台默认值：1）", type = "String"),
-            @ApiImplicitParam(name = "pageSize", value = "每页展示数据量（可为空，后台默认值：10）", type = "String"),
-            @ApiImplicitParam(name = "orderByColumn", value = "排序字段（可为空，传类属性）", type = "String"),
-            @ApiImplicitParam(name = "isAsc", value = "排序字段（可为空，请传asc或者desc）", type = "String")
-    })
-    public List<PartnerProjectInfo> getPersonAllocationProjectList()  {
-        QueryWrapper<PartnerProjectInfo> ppiQW = new QueryWrapper<>();
-        ppiQW.in("status", 15);
-        return partnerProjectInfoService.list(ppiQW);
-    }
 
-    @PostMapping("/getPersonSaveProjectList")
+    @PostMapping("/getPersonProjectStatistics")
     @ResponseBody
-    @ApiOperation(value = "草稿箱列表",notes = "直接调用")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "第几页（可为空，后台默认值：1）", type = "String"),
-            @ApiImplicitParam(name = "pageSize", value = "每页展示数据量（可为空，后台默认值：10）", type = "String"),
-            @ApiImplicitParam(name = "orderByColumn", value = "排序字段（可为空，传类属性）", type = "String"),
-            @ApiImplicitParam(name = "isAsc", value = "排序字段（可为空，请传asc或者desc）", type = "String")
-    })
-    public List<PartnerProjectInfo> getPersonSaveProjectList()  {
-        QueryWrapper<PartnerProjectInfo> ppiQW = new QueryWrapper<>();
-        ppiQW.in("status", 0);
-        return partnerProjectInfoService.list(ppiQW);
+    @ApiOperation(value = "我的项目",notes = "直接调用")
+    public MyPartnerProjectInfoVO getPersonProjectStatistics()  {
+        return partnerProjectInfoService.getPersonProjectStatistics(getUserInfo().getUserId());
     }
 
 
-    @PostMapping("/savePersonProject")
-    @ResponseBody
-    @ApiOperation(value = "保存项目",notes = "")
-    public PartnerProjectInfo savePersonProject(@RequestBody PartnerProjectInfo partnerProjectInfo) {
-        partnerProjectInfo.setPartnerId(getUserInfo().getUserId());
-        partnerProjectInfo.setStatus(PartnerProjectStatusEnum.PROJECTSTATUS0.code());
-        partnerProjectInfo.setStatusDescription(PartnerProjectStatusEnum.PROJECTSTATUS0.message());
-
-        partnerProjectInfoService.save(partnerProjectInfo);
-        return partnerProjectInfo;
-    }
-
 
-    @PostMapping("/submitPersonProject")
+    @PostMapping("/saveOrUpdatePersonProject")
     @ResponseBody
-    @ApiOperation(value = "提交项目",notes = "")
-    public PartnerProjectInfo submitPersonProject(@RequestBody PartnerProjectInfo partnerProjectInfo) {
-        partnerProjectInfo.setPartnerId(getUserInfo().getUserId());
-        partnerProjectInfo.setStatus(PartnerProjectStatusEnum.PROJECTSTATUS1.code());
-        partnerProjectInfo.setStatusDescription(PartnerProjectStatusEnum.PROJECTSTATUS1.message());
-        partnerProjectInfoService.save(partnerProjectInfo);
-        return partnerProjectInfo;
+    @ApiOperation(value = "项目暂存或者提报（status：0暂存；1提交）",notes = "")
+    public Integer saveOrUpdatePersonProject(@RequestBody PartnerProjectInfoVO partnerProjectInfoVO) {
+        return partnerProjectInfoService.saveOrUpdatePersonProject(partnerProjectInfoVO,getUserInfo().getUserId());
     }
 
     @PostMapping("/examineProjectDetail")
@@ -136,19 +60,24 @@ public class PartnerProjectController extends BaseController{
     @ApiOperation(value = "审核中项目详情页",notes = "")
     @ApiImplicitParam(name = "id", value = "项目id", type = "Integer")
     public PartnerExamineProjectInfoVO examineProjectDetail(Integer id) {
-        PartnerProjectInfo partnerProjectInfo = partnerProjectInfoService.getById(id);
-        PartnerExamineProjectInfoVO partnerExamineProjectInfoVO = new PartnerExamineProjectInfoVO();
-        BeanUtils.copyProperties(partnerProjectInfo,partnerExamineProjectInfoVO);
-        return partnerExamineProjectInfoVO;
+        return partnerProjectInfoService.examineProjectDetail(id);
     }
 
-    @PostMapping("/updatePersonProject")
+
+    @PostMapping("/pushProjectDetail")
     @ResponseBody
-    @ApiOperation(value = "修改项目信息",notes = "")
-    public PartnerProjectInfo updatePersonProject(@RequestBody PartnerProjectInfo partnerProjectInfo) {
-        partnerProjectInfo.setPartnerId(getUserInfo().getUserId());
-        partnerProjectInfoService.updateById(partnerProjectInfo);
-        return partnerProjectInfo;
+    @ApiOperation(value = "推进中项目详情页",notes = "")
+    @ApiImplicitParam(name = "id", value = "项目id", type = "Integer")
+    public PartnerPushProjectInfoVO pushProjectDetail(Integer id) {
+        return partnerProjectInfoService.pushProjectDetail(id);
+    }
+
+    @PostMapping("/allocationProjectDetail")
+    @ResponseBody
+    @ApiOperation(value = "分配中项目详情页",notes = "")
+    @ApiImplicitParam(name = "id", value = "项目id", type = "Integer")
+    public PartnerAllocationProjectInfoVO allocationProjectDetail(Integer id) {
+        return partnerProjectInfoService.allocationProjectDetail(id);
     }
 
 }

src/main/java/com/partner/admin/controller/PersonalController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.partner.admin.VO.PartnerBaseInfoVO;
 import com.partner.admin.VO.PartnerCoporateAccountInfoVO;
 import com.partner.admin.domain.*;
+import com.partner.admin.mapper.PartnerImageSourceMapper;
 import com.partner.admin.service.PartnerBaseInfoService;
 import com.partner.admin.service.PartnerCoporateAccountInfoService;
 import com.partner.admin.service.PartnerImageSourceService;
@@ -33,6 +34,9 @@ public class PersonalController extends BaseController{
     @Autowired
     PartnerImageSourceService partnerImageSourceService;
 
+//    @Autowired
+//    PartnerImageSourceMapper partnerImageSourceMapper;
+
     @Autowired
     PartnerBaseInfoService partnerBaseInfoService;
 
@@ -64,6 +68,7 @@ public class PersonalController extends BaseController{
                 QueryWrapper<PartnerImageSource> pisQW = new QueryWrapper<>();
                 pisQW.eq("object_id", partnerCoporateAccountInfoList.get(i).getId());
                 pisQW.eq("object_type", 3);
+                pisQW.eq("status", 1);
                 pisQW.orderByAsc("image_sort");
                 List<PartnerImageSource> list = partnerImageSourceService.list(pisQW);
                 PartnerCoporateAccountInfoVO partnerCoporateAccountInfoVO = new PartnerCoporateAccountInfoVO();
@@ -81,42 +86,115 @@ public class PersonalController extends BaseController{
     @PostMapping("/saveOrUpdatePersonalInfo")
     @ResponseBody
     @ApiOperation(value = "保存我的信息",notes = "")
-    public PartnerBaseInfoVO saveOrUpdatePersonalInfo(@RequestBody PartnerBaseInfoVO partnerBaseInfoVO)  {
+    public Integer saveOrUpdatePersonalInfo(@RequestBody PartnerBaseInfo partnerBaseInfo)  {
         Integer userId = getUserInfo().getUserId();
-        partnerBaseInfoVO.getPartnerBaseInfo().setId(userId);
-        partnerBaseInfoService.saveOrUpdate(partnerBaseInfoVO.getPartnerBaseInfo());
+        partnerBaseInfo.setId(userId);
+        partnerBaseInfoService.saveOrUpdate(partnerBaseInfo);
+
+//        List<PartnerCoporateAccountInfoVO> list = partnerBaseInfoVO.getPartnerCoporateAccountInfoVO();
+//        if(list != null){
+//            for (int i = 0; i < list.size(); i++) {
+//                PartnerCoporateAccountInfoVO partnerCoporateAccountInfoVO = list.get(i);
+//
+//                PartnerCoporateAccountInfo partnerCoporateAccountInfo = partnerCoporateAccountInfoVO.getPartnerCoporateAccountInfo();
+//                partnerCoporateAccountInfo.setPartnerId(userId);
+//                partnerCoporateAccountInfoService.saveOrUpdate(partnerCoporateAccountInfo);
+//
+//                List<PartnerImageSource> partnerImageSourceList = partnerCoporateAccountInfoVO.getPartnerImageSourceList();
+//                if(partnerImageSourceList != null && partnerImageSourceList.size()>0){
+//                    for (int j = 0; j < partnerImageSourceList.size(); j++) {
+//                        partnerImageSourceList.get(j).setObjectType(3);
+//                        partnerImageSourceList.get(j).setObjectId(partnerCoporateAccountInfo.getId());
+//                        partnerImageSourceList.get(j).setImageSort(j);
+//                        partnerImageSourceList.get(j).setStatus(1);
+//                        partnerImageSourceService.saveOrUpdate(partnerImageSourceList.get(j));
+//                    }
+//                }
+//            }
+//        }
+        return partnerBaseInfo.getId();
+    }
 
-        List<PartnerCoporateAccountInfoVO> list = partnerBaseInfoVO.getPartnerCoporateAccountInfoVO();
-        if(list != null){
-            for (int i = 0; i < list.size(); i++) {
-                PartnerCoporateAccountInfoVO partnerCoporateAccountInfoVO = list.get(i);
+    @PostMapping("/saveCoporateAccountInfo")
+    @ResponseBody
+    @ApiOperation(value = "新增公司主体",notes = "")
+    public boolean saveCoporateAccountInfo(@RequestBody PartnerCoporateAccountInfoVO partnerCoporateAccountInfoVO)  {
 
         PartnerCoporateAccountInfo partnerCoporateAccountInfo = partnerCoporateAccountInfoVO.getPartnerCoporateAccountInfo();
-                partnerCoporateAccountInfo.setPartnerId(userId);
-                partnerCoporateAccountInfoService.saveOrUpdate(partnerCoporateAccountInfo);
+        partnerCoporateAccountInfo.setPartnerId(getUserInfo().getUserId());
+        partnerCoporateAccountInfoService.save(partnerCoporateAccountInfo);
+
+        Integer objectId = partnerCoporateAccountInfo.getId();
+        QueryWrapper<PartnerImageSource> PISQW = new QueryWrapper<>();
+        PISQW.eq("object_id",objectId);
+        PISQW.eq("object_type",3);
+        //获取到历史数据及文件先删除文件然后删除数据。
+        partnerImageSourceService.remove(PISQW);
 
         List<PartnerImageSource> partnerImageSourceList = partnerCoporateAccountInfoVO.getPartnerImageSourceList();
-                if(partnerImageSourceList != null && partnerImageSourceList.size()>0){
+        if(partnerImageSourceList != null && partnerImageSourceList.size()>0) {
             for (int j = 0; j < partnerImageSourceList.size(); j++) {
                 partnerImageSourceList.get(j).setObjectType(3);
-                        partnerImageSourceList.get(j).setObjectId(partnerCoporateAccountInfo.getId());
+                partnerImageSourceList.get(j).setObjectId(objectId);
                 partnerImageSourceList.get(j).setImageSort(j);
-                        partnerImageSourceService.saveOrUpdate(partnerImageSourceList.get(j));
+                partnerImageSourceList.get(j).setStatus(1);
+                partnerImageSourceService.save(partnerImageSourceList.get(j));
             }
         }
+        return true;
     }
+
+    @PostMapping("/updateCoporateAccountInfo")
+    @ResponseBody
+    @ApiOperation(value = "修改公司主体",notes = "")
+    public boolean updateCoporateAccountInfo(@RequestBody PartnerCoporateAccountInfoVO partnerCoporateAccountInfoVO)  {
+
+        PartnerCoporateAccountInfo partnerCoporateAccountInfo = partnerCoporateAccountInfoVO.getPartnerCoporateAccountInfo();
+        partnerCoporateAccountInfo.setPartnerId(getUserInfo().getUserId());
+        partnerCoporateAccountInfoService.saveOrUpdate(partnerCoporateAccountInfo);
+
+        Integer objectId = partnerCoporateAccountInfo.getId();
+        QueryWrapper<PartnerImageSource> PISQW = new QueryWrapper<>();
+        PISQW.eq("object_id",objectId);
+        PISQW.eq("object_type",3);
+        //获取到历史数据及文件先删除文件然后删除数据。
+        partnerImageSourceService.remove(PISQW);
+
+        List<PartnerImageSource> partnerImageSourceList = partnerCoporateAccountInfoVO.getPartnerImageSourceList();
+        if(partnerImageSourceList != null && partnerImageSourceList.size()>0) {
+            for (int j = 0; j < partnerImageSourceList.size(); j++) {
+                partnerImageSourceList.get(j).setObjectType(3);
+                partnerImageSourceList.get(j).setObjectId(objectId);
+                partnerImageSourceList.get(j).setImageSort(j);
+                partnerImageSourceList.get(j).setStatus(1);
+                partnerImageSourceService.save(partnerImageSourceList.get(j));
             }
-        return partnerBaseInfoVO;
+        }
+        return true;
     }
 
-
-    @PostMapping("/deletePartnerImageSource")
+    @PostMapping("/deleteCoporateAccountInfo")
     @ResponseBody
-    @ApiOperation(value = "删除营业执照图片（逻辑删除）",notes = "")
-    public void deletePartnerImageSource(PartnerImageSource partnerImageSource)  {
-        partnerImageSource.setStatus(0);
-        partnerImageSourceService.updateById(partnerImageSource);
+    @ApiOperation(value = "删除公司主体",notes = "")
+    public boolean deleteCoporateAccountInfo(Integer id)  {
+
+        partnerCoporateAccountInfoService.removeById(id);
+        QueryWrapper<PartnerImageSource> PISQW = new QueryWrapper<>();
+        PISQW.eq("object_id",id);
+        PISQW.eq("object_type",3);
+        //获取到历史数据及文件先删除文件然后删除数据。
+        partnerImageSourceService.remove(PISQW);
+        return true;
     }
 
 
+//    @PostMapping("/deletePartnerImageSource")
+//    @ResponseBody
+//    @ApiOperation(value = "删除营业执照图片（逻辑删除）",notes = "")
+//    public void deletePartnerImageSource(PartnerImageSource partnerImageSource)  {
+//        partnerImageSource.setStatus(0);
+//        partnerImageSourceService.updateById(partnerImageSource);
+//    }
+
+
 }

src/main/java/com/partner/admin/controller/WeixinController.java

@@ -7,7 +7,9 @@ import com.partner.admin.VO.SysUserVO;
 import com.partner.admin.common.exception.APIException;
 import com.partner.admin.common.exception.APIExceptionEnum;
 import com.partner.admin.common.utils.WeixinUtil;
+import com.partner.admin.domain.PartnerBaseInfo;
 import com.partner.admin.domain.SysUser;
+import com.partner.admin.service.PartnerBaseInfoService;
 import com.partner.admin.service.SysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,6 +31,9 @@ public class WeixinController extends BaseController {
     @Autowired
     SysUserService sysUserService;
 
+    @Autowired
+    PartnerBaseInfoService partnerBaseInfoService;
+
     @PostMapping("/login")
     @ResponseBody
     @ApiOperation(value = "获取手机号码并登录",notes = "")
@@ -57,6 +62,13 @@ public class WeixinController extends BaseController {
             sysUserInfo.setCreateBy("9999");
             sysUserInfo.setSource(1);
             sysUserService.save(sysUserInfo);
+
+            //初始化基本信息表
+//            PartnerBaseInfo partnerBaseInfo = new PartnerBaseInfo();
+//            partnerBaseInfo.setId(sysUserInfo.getUserId());
+//            partnerBaseInfo.setNickName("微信用户");
+//            partnerBaseInfo.setMobilePhone(phoneNumber);
+//            partnerBaseInfoService.save(partnerBaseInfo);
         }
 
         sysUserInfoVO.setLoginName(sysUserInfo.getLoginName());

src/main/java/com/partner/admin/domain/PartnerBaseInfo.java

@@ -22,7 +22,8 @@ public class PartnerBaseInfo implements Serializable {
      * 合伙人id
      */
     @TableId
-    @ApiModelProperty(value = "合伙人id")
+//    @ApiModelProperty(value = "合伙人id")
+    @ApiModelProperty(hidden = true)
     private Integer id;
 
     /**

src/main/java/com/partner/admin/domain/PartnerImageSource.java

@@ -18,13 +18,14 @@ import org.springframework.format.annotation.DateTimeFormat;
  */
 @TableName(value ="partner_image_source")
 @Data
-@ApiModel(value = "图片上传")
+@ApiModel(value = "图片")
 public class PartnerImageSource implements Serializable {
     /**
      * 
      */
     @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "图片id")
+//    @ApiModelProperty(value = "图片id")
+    @ApiModelProperty(hidden = true)
     private Integer id;
 
     /**
@@ -71,7 +72,8 @@ public class PartnerImageSource implements Serializable {
     /**
      * 排序
      */
-    @ApiModelProperty(value = "排序")
+//    @ApiModelProperty(value = "排序")
+    @ApiModelProperty(hidden = true)
     private Integer imageSort;
 
     /**

src/main/java/com/partner/admin/domain/PartnerProjectInfo.java

@@ -24,7 +24,8 @@ public class PartnerProjectInfo implements Serializable {
      * 
      */
     @TableId(type = IdType.AUTO)
-    @ApiModelProperty(hidden = true)
+//    @ApiModelProperty(hidden = true)
+    @ApiModelProperty(value = "项目id")
     private Integer id;
 
     /**
@@ -69,6 +70,12 @@ public class PartnerProjectInfo implements Serializable {
     @ApiModelProperty(value = "固定资产投资总额")
     private BigDecimal projectInvestmentRegular;
 
+    /**
+     * 投资内容
+     */
+    @ApiModelProperty(value = "投资内容")
+    private String investmentContent;
+
     /**
      * 项目诉求
      */
@@ -115,16 +122,17 @@ public class PartnerProjectInfo implements Serializable {
      * 决策人职位
      */
     @ApiModelProperty(value = "决策人职位")
-    private String decisonMakerPosition;
+    private String decisionMakerPosition;
 
     /**
      * 0-暂存 1-信息提报 2-项目查重通过 3-项目查重拒绝 4-招商公司匹配 5-企业对接 6-投资意向确认 7-确认项目信息 8-完成审核 9-项目信息 10-项目沟通 11-区域匹配  12-政企互访 13-项目谈判  14-项目签约 15-分配中 20-作废
      */
-    @ApiModelProperty(hidden = true)
+//    @ApiModelProperty(hidden = true)
+    @ApiModelProperty(value = "0-暂存 1-信息提报 2-项目查重 4-招商公司匹配 5-企业对接 6-投资意向确认 7-确认项目信息 8-完成审核 9-项目信息 10-项目沟通 11-区域匹配  12-政企互访 13-项目谈判  14-项目签约 15-分配中 20-作废")
     private Integer status;
 
     /**
-     * 0-暂存 1-信息提报 2-项目查重通过 3-项目查重拒绝 4-招商公司匹配 5-企业对接 6-投资意向确认 7-确认项目信息 8-完成审核 9-项目信息 10-项目沟通 11-区域匹配  12-政企互访 13-项目谈判  14-项目签约 15-分配中 20-作废
+     * 0-暂存 1-信息提报 2-项目查重 4-招商公司匹配 5-企业对接 6-投资意向确认 7-确认项目信息 8-完成审核 9-项目信息 10-项目沟通 11-区域匹配  12-政企互访 13-项目谈判  14-项目签约 15-分配中 20-作废
      */
     @ApiModelProperty(hidden = true)
     private String statusDescription;
@@ -177,6 +185,20 @@ public class PartnerProjectInfo implements Serializable {
     @ApiModelProperty(hidden = true)
     private Integer todoStatus;
 
+    /**
+     * 产业知道项目id
+     */
+    @ApiModelProperty(value = "产业知道项目id")
+    private Integer projectId;
+
+
+    /**
+     * 0-项目查重确认 1-确认项目所属 2-确认佣金比例
+     */
+    @ApiModelProperty(value = "0-项目查重确认 1-确认项目所属 2-确认佣金比例")
+    private String todoStatusDescription;
+
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

src/main/java/com/partner/admin/domain/PartnerProjectStatusChangeLog.java

@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -14,11 +17,13 @@ import lombok.Data;
  */
 @TableName(value ="partner_project_status_change_log")
 @Data
+@ApiModel(value = "审核节点")
 public class PartnerProjectStatusChangeLog implements Serializable {
     /**
      * 
      */
     @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
     private Integer id;
 
     /**
@@ -34,33 +39,51 @@ public class PartnerProjectStatusChangeLog implements Serializable {
     /**
      * 项目状态code
      */
+    @ApiModelProperty(value = "项目状态code")
     private Integer projectStatus;
 
     /**
      * 项目状态
      */
+    @ApiModelProperty(value = "项目状态")
     private String projectStatusDisplay;
 
     /**
      * 
      */
+    @ApiModelProperty(value = "所属项目id")
     private Integer projectId;
 
     /**
      * 操作人
      */
+    @ApiModelProperty(value = "操作人")
     private Integer operaterId;
 
     /**
      * 
      */
+    @ApiModelProperty(value = "")
     private Integer tenantId;
 
     /**
      * 描述
      */
+    @ApiModelProperty(value = "描述")
     private String description;
 
+    /**
+     * 0-项目查重确认 1-确认项目所属 2-确认佣金比例
+     */
+    @ApiModelProperty(value = "0-项目查重确认 1-确认项目所属 2-确认佣金比例")
+    private Integer todoStatus;
+
+    /**
+     * 0-项目查重确认 1-确认项目所属 2-确认佣金比例
+     */
+    @ApiModelProperty(value = "0-项目查重确认 1-确认项目所属 2-确认佣金比例")
+    private String todoStatusDescription;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

src/main/java/com/partner/admin/domain/ProjectInfo.java

+package com.partner.admin.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 30.01-投资内容
+ * @TableName project_info
+ */
+@TableName(value ="project_info")
+@Data
+public class ProjectInfo implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 项目编号（年月日）
+     */
+    private String projectNumber;
+
+    /**
+     * 项目编号（UUID）
+     */
+    private String projectId;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 投资方企业ID
+     */
+    private Long cid;
+
+    /**
+     * 应用领域
+     */
+    private String applyScope;
+
+    /**
+     * 投资动因ID
+     */
+    private Integer investReasonId;
+
+    /**
+     * 载体类型 1-基地 2-厂房 3-混合
+     */
+    private Integer baseType;
+
+    /**
+     * 总投资额（亿元）
+     */
+    private BigDecimal investAmount;
+
+    /**
+     * 固定资产投资额（亿元）
+     */
+    private BigDecimal fixAssetInvestAmount;
+
+    /**
+     * 达产后年产值（亿元）
+     */
+    private BigDecimal futureOutputValue;
+
+    /**
+     * 达产后年纳税（亿元）
+     */
+    private BigDecimal futureTax;
+
+    /**
+     * 达产后拉动就业人数（人）
+     */
+    private Integer futureJobNum;
+
+    /**
+     * 当前状态 1-待审批 2-进行中 3-中止 4-终止 5-草稿 6-结束
+     */
+    private Integer currentStatus;
+
+    /**
+     * 当前状态 1-项目线索 2-初期沟通 3-区域匹配/确认 4-政企互访 5-项目谈判 6-项目签约
+     */
+    private Integer currentStage;
+
+    /**
+     * 创建者
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 投资内容
+     */
+    private String investContent;
+
+    /**
+     * 终止原因类型
+     */
+    private Integer endCauseType;
+
+    /**
+     * 终止原因描述
+     */
+    private String endCauseDesc;
+
+    /**
+     * 项目状态 1 储备 2 在推
+     */
+    private Integer projectStatus;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

src/main/java/com/partner/admin/enumerate/PartnerProjectAllocationEnum.java

+package com.partner.admin.enumerate;
+
+public enum PartnerProjectAllocationEnum {
+
+    PROJECTSTATUS15(15,"分配中");
+
+
+    private int code;
+    private String message;
+
+
+    PartnerProjectAllocationEnum(int code, String message)
+    {
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode()
+    {
+        return this.code;
+    }
+    public String getMessage()
+    {
+        return this.message;
+    }
+
+    /**
+     * 根据code获取去value
+     * @param code
+     * @return
+     */
+    public static String getValueByCode(int code){
+        for(PartnerProjectAllocationEnum partnerProjectStatusEnum: PartnerProjectAllocationEnum.values()){
+            if(code == partnerProjectStatusEnum.getCode()){
+                return partnerProjectStatusEnum.getMessage();
+            }
+        }
+        return  null;
+    }
+
+
+}

src/main/java/com/partner/admin/enumerate/PartnerProjectExamineEnum.java

+package com.partner.admin.enumerate;
+
+public enum PartnerProjectExamineEnum {
+//     1-信息提报 2-项目查重通过 3-项目查重拒绝 4-招商公司匹配 5-企业决策人对接
+//     6-投资意向确认 7-确认项目信息 8-完成审核
+
+    PROJECTSTATUS1(1,"信息提报"),
+    PROJECTSTATUS2(2,"项目查重"),
+//    PROJECTSTATUS3(3,"项目查重拒绝"),
+    PROJECTSTATUS4(4,"招商公司匹配"),
+    PROJECTSTATUS5(5,"企业决策人对接"),
+    PROJECTSTATUS6(6,"投资意向确认"),
+    PROJECTSTATUS7(7,"确认项目信息"),
+    PROJECTSTATUS8(8,"完成审核");
+
+    private int code;
+    private String message;
+
+
+    PartnerProjectExamineEnum(int code, String message)
+    {
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode()
+    {
+        return this.code;
+    }
+    public String getMessage()
+    {
+        return this.message;
+    }
+
+    /**
+     * 根据code获取去value
+     * @param code
+     * @return
+     */
+    public static String getValueByCode(int code){
+        for(PartnerProjectExamineEnum partnerProjectStatusEnum: PartnerProjectExamineEnum.values()){
+            if(code == partnerProjectStatusEnum.getCode()){
+                return partnerProjectStatusEnum.getMessage();
+            }
+        }
+        return  null;
+    }
+
+
+}

src/main/java/com/partner/admin/common/menu/PartnerProjectStatusEnum.java → src/main/java/com/partner/admin/enumerate/PartnerProjectPushEnum.java

-package com.partner.admin.common.menu;
-
-public enum PartnerProjectStatusEnum {
-//     0-暂存 1-信息提报 2-项目查重通过 3-项目查重拒绝 4-招商公司匹配 5-企业对接
-//     6-投资意向确认 7-确认项目信息 8-完成审核
-    PROJECTSTATUS0(0,"暂存"),
-    PROJECTSTATUS1(1,"信息提报"),
-    PROJECTSTATUS2(2,"项目查重通过"),
-    PROJECTSTATUS3(3,"项目查重拒绝"),
-    PROJECTSTATUS4(4,"招商公司匹配"),
-    PROJECTSTATUS5(5,"企业对接"),
-    PROJECTSTATUS6(6,"投资意向确认"),
-    PROJECTSTATUS7(7,"确认项目信息"),
-    PROJECTSTATUS8(8,"完成审核"),
+package com.partner.admin.enumerate;
+
+public enum PartnerProjectPushEnum {
+
     //     9-项目信息 10-项目沟通 11-区域匹配  12-政企互访 13-项目谈判  14-项目签约
-    //     15-分配中 20-作废
+
     PROJECTSTATUS9(9,"项目信息"),
     PROJECTSTATUS10(10,"项目沟通"),
     PROJECTSTATUS11(11,"区域匹配"),
     PROJECTSTATUS12(12,"政企互访"),
     PROJECTSTATUS13(13,"项目谈判"),
-    PROJECTSTATUS14(14,"项目签约"),
-    PROJECTSTATUS15(15,"分配中"),
-    PROJECTSTATUS20(20,"作废");
+    PROJECTSTATUS14(14,"项目签约");
 
     private int code;
     private String message;
 
 
-    PartnerProjectStatusEnum(int code,String message)
+    PartnerProjectPushEnum(int code, String message)
     {
         this.code = code;
         this.message = message;
     }
 
-    public int code()
+    public int getCode()
     {
         return this.code;
     }
-    public String message()
+    public String getMessage()
     {
         return this.message;
     }
 
+    /**
+     * 根据code获取去value
+     * @param code
+     * @return
+     */
+    public static String getValueByCode(int code){
+        for(PartnerProjectPushEnum partnerProjectStatusEnum: PartnerProjectPushEnum.values()){
+            if(code == partnerProjectStatusEnum.getCode()){
+                return partnerProjectStatusEnum.getMessage();
+            }
+        }
+        return  null;
+    }
+
+
 }

src/main/java/com/partner/admin/enumerate/PartnerProjectStatusEnum.java

+package com.partner.admin.enumerate;
+
+public enum PartnerProjectStatusEnum {
+
+    PROJECTSTATUS0(0,"暂存"),
+    PROJECTSTATUS20(20,"作废");
+    private int code;
+    private String message;
+
+
+    PartnerProjectStatusEnum(int code, String message)
+    {
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode()
+    {
+        return this.code;
+    }
+    public String getMessage()
+    {
+        return this.message;
+    }
+
+    /**
+     * 根据code获取去value
+     * @param code
+     * @return
+     */
+    public static String getValueByCode(int code){
+        for(PartnerProjectStatusEnum partnerProjectStatusEnum: PartnerProjectStatusEnum.values()){
+            if(code == partnerProjectStatusEnum.getCode()){
+                return partnerProjectStatusEnum.getMessage();
+            }
+        }
+        return  null;
+    }
+
+
+}

src/main/java/com/partner/admin/enumerate/PartnerProjectToDoEnum.java

+package com.partner.admin.enumerate;
+
+public enum PartnerProjectToDoEnum {
+
+//    0-项目查重确认 1-确认项目所属 2-确认佣金比例
+    TODOSTATUS0(0,"项目查重确认"),
+    TODOSTATUS1(1,"确认项目所属"),
+    TODOSTATUS2(2,"确认佣金比例");
+
+    private int code;
+    private String message;
+
+
+    PartnerProjectToDoEnum(int code, String message)
+    {
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode()
+    {
+        return this.code;
+    }
+    public String getMessage()
+    {
+        return this.message;
+    }
+
+    /**
+     * 根据code获取去value
+     * @param code
+     * @return
+     */
+    public static String getValueByCode(int code){
+        for(PartnerProjectToDoEnum partnerProjectStatusEnum: PartnerProjectToDoEnum.values()){
+            if(code == partnerProjectStatusEnum.getCode()){
+                return partnerProjectStatusEnum.getMessage();
+            }
+        }
+        return  null;
+    }
+
+
+}

src/main/java/com/partner/admin/mapper/PartnerProjectInfoMapper.java

 package com.partner.admin.mapper;
 
-import com.partner.admin.VO.HomePageLoginInfoVO;
-import com.partner.admin.VO.HomePageLogoutInfoVO;
+import com.partner.admin.VO.PartnerProjectInfoListVO;
+import com.partner.admin.VO.PersonalStatisticsVO;
+import com.partner.admin.VO.PlatformProjectStatisticsVO;
 import com.partner.admin.domain.PartnerProjectInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import java.util.Map;
+import java.util.List;
 
 /**
 * @author 26996
@@ -15,9 +16,11 @@ import java.util.Map;
 */
 public interface PartnerProjectInfoMapper extends BaseMapper<PartnerProjectInfo> {
 
-    public HomePageLoginInfoVO getLoginStatistics(Integer userId);
+    public PersonalStatisticsVO getPersonalStatistics(Integer userId);
 
-    public HomePageLogoutInfoVO getLogoutStatistics();
+    public PlatformProjectStatisticsVO getPlatformProjectStatistics();
+
+    public List<PartnerProjectInfoListVO> getPartnerProjectListInfoVO(Integer userId);
 }
 
 

src/main/java/com/partner/admin/mapper/PartnerProjectStatusChangeLogMapper.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
 * @author 26996
 * @description 针对表【partner_project_status_change_log】的数据库操作Mapper
-* @createDate 2023-10-09 16:41:12
+* @createDate 2023-10-25 09:53:24
 * @Entity com.partner.admin.domain.PartnerProjectStatusChangeLog
 */
 public interface PartnerProjectStatusChangeLogMapper extends BaseMapper<PartnerProjectStatusChangeLog> {

src/main/java/com/partner/admin/mapper/ProjectInfoMapper.java

+package com.partner.admin.mapper;
+
+import com.partner.admin.domain.ProjectInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author 26996
+* @description 针对表【project_info(30.01-投资内容)】的数据库操作Mapper
+* @createDate 2023-10-24 17:29:07
+* @Entity com.partner.admin.domain.ProjectInfo
+*/
+public interface ProjectInfoMapper extends BaseMapper<ProjectInfo> {
+
+}
+
+
+
+

src/main/java/com/partner/admin/service/PartnerProjectInfoService.java

 package com.partner.admin.service;
 
-import com.partner.admin.VO.HomePageLoginInfoVO;
-import com.partner.admin.VO.HomePageLogoutInfoVO;
+import com.partner.admin.VO.*;
 import com.partner.admin.domain.PartnerProjectInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.partner.admin.mapper.PartnerProjectInfoMapper;
 
-import java.util.Map;
+import java.util.List;
 
 /**
 * @author 26996
@@ -16,7 +14,18 @@ import java.util.Map;
 public interface PartnerProjectInfoService extends IService<PartnerProjectInfo> {
 
 
-    public HomePageLoginInfoVO getLoginStatistics(Integer userId);
+    public PersonalStatisticsVO getPersonalStatistics(Integer userId);
 
-    public HomePageLogoutInfoVO getLogoutStatistics();
+    public PlatformProjectStatisticsVO getPlatformProjectStatistics();
+
+    public List<PartnerProjectInfoListVO> getPartnerProjectListInfoVO(Integer userId);
+
+    public MyPartnerProjectInfoVO getPersonProjectStatistics(Integer userId);
+
+    public Integer saveOrUpdatePersonProject( PartnerProjectInfoVO partnerProjectInfoVO,Integer userId);
+
+    public PartnerExamineProjectInfoVO examineProjectDetail(Integer id) ;
+
+    public PartnerPushProjectInfoVO pushProjectDetail(Integer id) ;
+    public PartnerAllocationProjectInfoVO allocationProjectDetail(Integer id) ;
 }

src/main/java/com/partner/admin/service/PartnerProjectStatusChangeLogService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
 * @author 26996
 * @description 针对表【partner_project_status_change_log】的数据库操作Service
-* @createDate 2023-10-09 16:41:12
+* @createDate 2023-10-25 09:53:24
 */
 public interface PartnerProjectStatusChangeLogService extends IService<PartnerProjectStatusChangeLog> {
 

src/main/java/com/partner/admin/service/ProjectInfoService.java

+package com.partner.admin.service;
+
+import com.partner.admin.domain.ProjectInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author 26996
+* @description 针对表【project_info(30.01-投资内容)】的数据库操作Service
+* @createDate 2023-10-24 17:29:07
+*/
+public interface ProjectInfoService extends IService<ProjectInfo> {
+
+}

src/main/java/com/partner/admin/service/impl/PartnerProjectStatusChangeLogServiceImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 /**
 * @author 26996
 * @description 针对表【partner_project_status_change_log】的数据库操作Service实现
-* @createDate 2023-10-09 16:41:12
+* @createDate 2023-10-25 09:53:24
 */
 @Service
 public class PartnerProjectStatusChangeLogServiceImpl extends ServiceImpl<PartnerProjectStatusChangeLogMapper, PartnerProjectStatusChangeLog>

src/main/java/com/partner/admin/service/impl/ProjectInfoServiceImpl.java

+package com.partner.admin.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.partner.admin.domain.ProjectInfo;
+import com.partner.admin.service.ProjectInfoService;
+import com.partner.admin.mapper.ProjectInfoMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author 26996
+* @description 针对表【project_info(30.01-投资内容)】的数据库操作Service实现
+* @createDate 2023-10-24 17:29:07
+*/
+@Service
+public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, ProjectInfo>
+    implements ProjectInfoService{
+
+}
+
+
+
+

src/main/resources/application-test.yml

@@ -2,7 +2,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://rm-2ze10ohzb1898j5qd.mysql.rds.aliyuncs.com:3306/know_db?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true
+    url: jdbc:mysql://rm-2ze10ohzb1898j5qdfo.mysql.rds.aliyuncs.com:3306/know_db?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true
     username: liyeyun
     password: CF**ldcn
     # 初始连接数

src/main/resources/application.yml

@@ -24,7 +24,7 @@ logging:
 spring:
   # 配置环境切换
   profiles:
-    active: dev
+    active: test
   # 文件上传
   servlet:
     multipart:

src/main/resources/mapper/PartnerProjectInfoMapper.xml

@@ -45,7 +45,7 @@
         todo_status
     </sql>
 
-    <select id= "getLoginStatistics" parameterType="Integer" resultType="com.partner.admin.VO.HomePageLoginInfoVO">
+    <select id= "getPersonalStatistics" parameterType="Integer" resultType="com.partner.admin.VO.PersonalStatisticsVO">
 --         统计数-总项目量+总投资额+审核中的项目+推进中的项目
         select sum(project_all_count) project_all_count,sum(project_investment_total) project_investment_total,
                sum(project_examine_count) project_examine_count,sum(project_push_count) project_push_count
@@ -56,14 +56,14 @@
                  select 0 project_all_count,sum(project_investment_total) project_investment_total, 0 project_examine_count,0 project_push_count from  partner_project_info where partner_id = #{userId}
                  union all
                  select 0 project_all_count,0 project_investment_total, count(1) project_examine_count,0 project_push_count from  partner_project_info
-                 where status in (1,2,3,4,5,6,7,8) and partner_id = #{userId}
+                 where status in (1,2,4,5,6,7,8) and partner_id = #{userId}
                  union all
                  select 0 project_all_count,0 project_investment_total, 0 project_examine_count, count(1)  project_push_count from  partner_project_info
                  where status in (9,10,11,12,13,14) and partner_id = #{userId}
              ) A
     </select>
 
-    <select id= "getLogoutStatistics"  resultType="com.partner.admin.VO.HomePageLogoutInfoVO">
+    <select id= "getPlatformProjectStatistics"  resultType="com.partner.admin.VO.PlatformProjectStatisticsVO">
         select sum(project_all_count) project_all_count,sum(project_investment_total) project_investment_total,
                sum(project_investment_regular) project_investment_regular,sum(partner_count) partner_count
         from (
@@ -85,4 +85,13 @@
                  select 0 project_all_count,0 project_investment_total, 0 project_investment_regular,count(1) partner_count from  user_info
              ) A
     </select>
+
+    <select id= "getPartnerProjectListInfoVO"  parameterType="Integer" resultType="com.partner.admin.VO.PartnerProjectInfoListVO">
+        select ppi.id,ppi.investment_subject,ppi.status,ppi.status_description,ppi.todo_status,
+               pi.project_name,autt.org_code,autt.org_name,ui.phone from partner_project_info ppi
+        left join project_info pi  on ppi.project_id = pi.id
+        left join audit_user_tree_table autt on pi.creator = autt.user_name_en
+        left join user_info ui on pi.creator = ui.user_name_en
+        where ppi.partner_id = #{userId}
+    </select>
 </mapper>

src/main/resources/mapper/PartnerProjectStatusChangeLogMapper.xml

@@ -14,11 +14,14 @@
             <result property="operaterId" column="operater_id" jdbcType="INTEGER"/>
             <result property="tenantId" column="tenant_id" jdbcType="INTEGER"/>
             <result property="description" column="description" jdbcType="VARCHAR"/>
+            <result property="todoStatus" column="todo_status" jdbcType="TINYINT"/>
+            <result property="todoStatusDescription" column="todo_status_description" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         id,create_time,update_time,
         project_status,project_status_display,project_id,
-        operater_id,tenant_id,description
+        operater_id,tenant_id,description,
+        todo_status,todo_status_description
     </sql>
 </mapper>

src/main/resources/mapper/ProjectInfoMapper.xml

+<?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.partner.admin.mapper.ProjectInfoMapper">
+
+    <resultMap id="BaseResultMap" type="com.partner.admin.domain.ProjectInfo">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="projectNumber" column="project_number" jdbcType="VARCHAR"/>
+            <result property="projectId" column="project_id" jdbcType="VARCHAR"/>
+            <result property="projectName" column="project_name" jdbcType="VARCHAR"/>
+            <result property="cid" column="cid" jdbcType="BIGINT"/>
+            <result property="applyScope" column="apply_scope" jdbcType="VARCHAR"/>
+            <result property="investReasonId" column="invest_reason_id" jdbcType="TINYINT"/>
+            <result property="baseType" column="base_type" jdbcType="TINYINT"/>
+            <result property="investAmount" column="invest_amount" jdbcType="DECIMAL"/>
+            <result property="fixAssetInvestAmount" column="fix_asset_invest_amount" jdbcType="DECIMAL"/>
+            <result property="futureOutputValue" column="future_output_value" jdbcType="DECIMAL"/>
+            <result property="futureTax" column="future_tax" jdbcType="DECIMAL"/>
+            <result property="futureJobNum" column="future_job_num" jdbcType="INTEGER"/>
+            <result property="currentStatus" column="current_status" jdbcType="TINYINT"/>
+            <result property="currentStage" column="current_stage" jdbcType="TINYINT"/>
+            <result property="creator" column="creator" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="investContent" column="invest_content" jdbcType="VARCHAR"/>
+            <result property="endCauseType" column="end_cause_type" jdbcType="TINYINT"/>
+            <result property="endCauseDesc" column="end_cause_desc" jdbcType="VARCHAR"/>
+            <result property="projectStatus" column="project_status" jdbcType="TINYINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,project_number,project_id,
+        project_name,cid,apply_scope,
+        invest_reason_id,base_type,invest_amount,
+        fix_asset_invest_amount,future_output_value,future_tax,
+        future_job_num,current_status,current_stage,
+        creator,create_time,update_time,
+        invest_content,end_cause_type,end_cause_desc,
+        project_status
+    </sql>
+</mapper>