合伙招商api

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -16,10 +17,13 @@ import java.util.List;
 public class PartnerAllocationProjectInfoVO implements Serializable {
 
     @ApiModelProperty(value = "分配中内容详情")
-    private PartnerAllocationDetailVO partnerAllocationDetail;
+    private PartnerAllocationDetailVO partnerAllocationDetail = new PartnerAllocationDetailVO();
 
     @ApiModelProperty(value = "审核节点")
-    private List<PartnerProjectStatusChangeLog> partnerProjectStatusChangeLogs;
+    private List<PartnerProjectStatusChangeLog> partnerProjectStatusChangeLogs = new ArrayList<>();
+
+    @ApiModelProperty(value = "合伙人信息")
+    private PartnerSecretaryVO partnerSecretary = new PartnerSecretaryVO();
 
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

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

@@ -72,5 +72,6 @@ public class PartnerExamineDetailVO implements Serializable {
 //    @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

 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.PartnerProjectStatusChangeLog;
 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.ArrayList;
 import java.util.List;
 
 /**
@@ -22,10 +17,13 @@ import java.util.List;
 public class PartnerExamineProjectInfoVO implements Serializable {
 
     @ApiModelProperty(value = "审核中内容详情")
-    private PartnerExamineDetailVO partnerExamineDetail;
+    private PartnerExamineDetailVO partnerExamineDetail = new PartnerExamineDetailVO();
 
     @ApiModelProperty(value = "审核节点")
-    private List<PartnerProjectStatusChangeLog> partnerProjectStatusChangeLogs;
+    private List<PartnerProjectStatusChangeLog> partnerProjectStatusChangeLogs = new ArrayList<>();
+
+    @ApiModelProperty(value = "合伙人信息")
+    private PartnerSecretaryVO partnerSecretary = new PartnerSecretaryVO();
 
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

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

@@ -5,7 +5,7 @@ import lombok.Data;
 
 public class PartnerProjectTemplate {
 
-    public static final String content ="<p>\n" +
+    public static final String projectConfirmTemplate ="<p>\n" +
             "\t致：<span>@person</span> \n" +
             "</p>\n" +
             "<p>\n" +
@@ -32,4 +32,6 @@ public class PartnerProjectTemplate {
             "<p>\n" +
             "\t@date \n" +
             "</p>\n";
+
+    public static final String commissionConfirmTemplate ="";
 }

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -16,10 +17,13 @@ import java.util.List;
 public class PartnerPushProjectInfoVO implements Serializable {
 
     @ApiModelProperty(value = "推进中内容详情")
-    private PartnerPushDetailVO partnerPushDetailVODetail;
+    private PartnerPushDetailVO partnerPushDetailVODetail = new PartnerPushDetailVO();
 
     @ApiModelProperty(value = "审核节点")
-    private List<PartnerProjectStatusChangeLog> partnerProjectStatusChangeLogs;
+    private List<PartnerProjectStatusChangeLog> partnerProjectStatusChangeLogs = new ArrayList<>();
+
+    @ApiModelProperty(value = "合伙人信息")
+    private PartnerSecretaryVO partnerSecretary = new PartnerSecretaryVO();
 
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

src/main/java/com/partner/admin/VO/PartnerSecretaryVO.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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value="合伙人信息")
+public class PartnerSecretaryVO {
+
+
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
+    /**
+     * 名字
+     */
+    @ApiModelProperty(value = "名字")
+    private String name;
+
+    /**
+     * 头像
+     */
+    @ApiModelProperty(value = "头像")
+    private String headerUrl;
+
+    /**
+     * 电话号码
+     */
+    @ApiModelProperty(value = "电话号码")
+    private String telephone;
+
+    /**
+     * 微信二维码图片
+     */
+    @ApiModelProperty(value = "微信二维码图片")
+    private String wxImageurl;
+
+    /**
+     * 成功落地项目数量
+     */
+//    @ApiModelProperty(hidden = true)
+//    private Integer successProjectNumber;
+//
+//    /**
+//     * 当前服务的项目数量
+//     */
+//    @ApiModelProperty(hidden = true)
+//    private Integer currentServiceProjectNumber;
+
+    private static final long serialVersionUID = 1L;
+
+}

src/main/java/com/partner/admin/VO/PartnerTemplateVO.java → src/main/java/com/partner/admin/VO/ProjectConfirmTemplateVO.java

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
  */
 @Data
 @ApiModel(value="模板")
-public class PartnerTemplateVO implements Serializable {
+public class ProjectConfirmTemplateVO implements Serializable {
     /**
      * 
      */

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

@@ -94,12 +94,20 @@ public class PartnerProjectController extends BaseController{
         return partnerProjectInfoService.allocationProjectDetail(id);
     }
 
-    @PostMapping("/getTemplateContent")
+    @PostMapping("/getProjectConfirmTemplate")
     @ResponseBody
-    @ApiOperation(value = "返回模板",notes = "")
+    @ApiOperation(value = "项目信息确认模板",notes = "")
     @ApiImplicitParam(name = "id", value = "项目id", type = "Integer")
-    public String getTemplateContent(Integer id){
-        return partnerProjectInfoService.getTemplateContent(id);
+    public String getProjectConfirmTemplate(Integer id){
+        return partnerProjectInfoService.getProjectConfirmTemplate(id);
+    }
+
+    @PostMapping("/getCommissionConfirmTemplate")
+    @ResponseBody
+    @ApiOperation(value = "佣金比例确认模板",notes = "")
+    @ApiImplicitParam(name = "id", value = "项目id", type = "Integer")
+    public String getCommissionConfirmTemplate(Integer id){
+        return partnerProjectInfoService.getCommissionConfirmTemplate(id);
     }
 
 }

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

@@ -62,8 +62,7 @@ public class PersonalController extends BaseController{
     @ResponseBody
     @ApiOperation(value = "保存我的信息",notes = "")
     public Integer saveOrUpdatePersonalInfo(@RequestBody PartnerBaseInfo partnerBaseInfo)  {
-        Integer userId = getUserInfo().getUserId();
-        partnerBaseInfo.setId(userId);
+        partnerBaseInfo.setId(getUserInfo().getUserId());
         partnerBaseInfoService.saveOrUpdate(partnerBaseInfo);
         return partnerBaseInfo.getId();
     }

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

@@ -31,7 +31,6 @@ public class SysFileController {
     @ApiOperation(value = "文件上传华为OBS",notes = "")
     public String uploadFileToHuaWeiOBS(MultipartFile file) throws Exception {
         return  parterConfig.getObsPath() + "/" + uploadService.uploadFile(file,"partner/file");
-
     }
 
 

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

@@ -64,11 +64,11 @@ public class WeixinController extends BaseController {
             sysUserService.save(sysUserInfo);
 
             //初始化基本信息表
-//            PartnerBaseInfo partnerBaseInfo = new PartnerBaseInfo();
-//            partnerBaseInfo.setId(sysUserInfo.getUserId());
-//            partnerBaseInfo.setNickName("微信用户");
-//            partnerBaseInfo.setMobilePhone(phoneNumber);
-//            partnerBaseInfoService.save(partnerBaseInfo);
+            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/PartnerSecretaryBind.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 lombok.Data;
+
+/**
+ * 
+ * @TableName partner_sectetary_bind
+ */
+@TableName(value ="partner_secretary_bind")
+@Data
+public class PartnerSecretaryBind implements Serializable {
+    /**
+     * 
+     */
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 用户id
+     */
+    private Integer userId;
+
+    /**
+     * 服务人id
+     */
+    private Integer secretaryId;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

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

+package com.partner.admin.enumerate;
+
+public enum ImageSourceTypeEnum {
+    //项目 (1-合伙人管理/区域大纲 2-项目信息图片  3-对公账户营业执照)
+    OWNER(1,"合伙人管理/区域大纲"),
+    PROJECT(2,"项目信息图片"),
+    BUSSINESSLICENSE(3,"对公账户营业执照"),
+
+    STOPSTATUS(0,"禁用"),
+    USESTATUS(1,"正常");
+
+
+    private int code;
+    private String message;
+
+
+    ImageSourceTypeEnum(int code, String message)
+    {
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode()
+    {
+        return this.code;
+    }
+    public String getMessage()
+    {
+        return this.message;
+    }
+
+}

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

@@ -27,7 +27,11 @@ public interface PartnerProjectInfoMapper extends BaseMapper<PartnerProjectInfo>
 
     public List<PartnerProjectInfoListVO> getToDoListInfoVO(Integer id);
 
-    public PartnerTemplateVO getTemplateContent(Integer id);
+    public ProjectConfirmTemplateVO getProjectConfirmTemplate(Integer id);
+
+    public ProjectConfirmTemplateVO getCommissionConfirmTemplate(Integer id);
+
+
 
 }
 

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

+package com.partner.admin.mapper;
+
+import com.partner.admin.domain.PartnerSecretaryBind;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author 26996
+* @description 针对表【partner_sectetary_bind】的数据库操作Mapper
+* @createDate 2023-10-27 14:58:16
+* @Entity com.partner.admin.domain.PartnerSectetaryBind
+*/
+public interface PartnerSecretaryBindMapper extends BaseMapper<PartnerSecretaryBind> {
+
+}
+
+
+
+

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

@@ -32,5 +32,7 @@ public interface PartnerProjectInfoService extends IService<PartnerProjectInfo>
 
     public PartnerAllocationProjectInfoVO allocationProjectDetail(Integer id) ;
 
-    public String getTemplateContent(Integer id) ;
+    public String getProjectConfirmTemplate(Integer id) ;
+
+    public String getCommissionConfirmTemplate(Integer id) ;
 }

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

+package com.partner.admin.service;
+
+import com.partner.admin.domain.PartnerSecretaryBind;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author 26996
+* @description 针对表【partner_sectetary_bind】的数据库操作Service
+* @createDate 2023-10-27 14:58:16
+*/
+public interface PartnerSecretaryBindService extends IService<PartnerSecretaryBind> {
+
+}

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

+package com.partner.admin.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.partner.admin.domain.PartnerSecretaryBind;
+import com.partner.admin.service.PartnerSecretaryBindService;
+import com.partner.admin.mapper.PartnerSecretaryBindMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author 26996
+* @description 针对表【partner_sectetary_bind】的数据库操作Service实现
+* @createDate 2023-10-27 14:58:16
+*/
+@Service
+public class PartnerSecretaryBindServiceImpl extends ServiceImpl<PartnerSecretaryBindMapper, PartnerSecretaryBind>
+    implements PartnerSecretaryBindService {
+
+}
+
+
+
+

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

@@ -8,6 +8,7 @@ import com.partner.admin.domain.PartnerBaseInfo;
 import com.partner.admin.domain.PartnerCoporateAccountInfo;
 import com.partner.admin.domain.PartnerFeedbackInfo;
 import com.partner.admin.domain.PartnerImageSource;
+import com.partner.admin.enumerate.ImageSourceTypeEnum;
 import com.partner.admin.mapper.PartnerFeedbackInfoMapper;
 import com.partner.admin.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,8 +54,8 @@ public class PersonalServiceImpl implements PersonalService {
             for (int i = 0; i < partnerCoporateAccountInfoList.size(); i++) {
                 QueryWrapper<PartnerImageSource> pisQW = new QueryWrapper<>();
                 pisQW.eq("object_id", partnerCoporateAccountInfoList.get(i).getId());
-                pisQW.eq("object_type", 3);
-                pisQW.eq("status", 1);
+                pisQW.eq("object_type", ImageSourceTypeEnum.BUSSINESSLICENSE.getCode());
+                pisQW.eq("status", ImageSourceTypeEnum.USESTATUS.getCode());
                 pisQW.orderByAsc("image_sort");
                 List<PartnerImageSource> list = partnerImageSourceService.list(pisQW);
                 PartnerCoporateAccountInfoVO partnerCoporateAccountInfoVO = new PartnerCoporateAccountInfoVO();
@@ -78,17 +79,17 @@ public class PersonalServiceImpl implements PersonalService {
         Integer objectId = partnerCoporateAccountInfo.getId();
         QueryWrapper<PartnerImageSource> PISQW = new QueryWrapper<>();
         PISQW.eq("object_id",objectId);
-        PISQW.eq("object_type",3);
+        PISQW.eq("object_type", ImageSourceTypeEnum.BUSSINESSLICENSE.getCode());
         //获取到历史数据及文件先删除文件然后删除数据。
         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).setObjectType(ImageSourceTypeEnum.BUSSINESSLICENSE.getCode());
                 partnerImageSourceList.get(j).setObjectId(objectId);
                 partnerImageSourceList.get(j).setImageSort(j);
-                partnerImageSourceList.get(j).setStatus(1);
+                partnerImageSourceList.get(j).setStatus(ImageSourceTypeEnum.USESTATUS.getCode());
                 partnerImageSourceService.save(partnerImageSourceList.get(j));
             }
         }
@@ -100,7 +101,7 @@ public class PersonalServiceImpl implements PersonalService {
         partnerCoporateAccountInfoService.removeById(id);
         QueryWrapper<PartnerImageSource> PISQW = new QueryWrapper<>();
         PISQW.eq("object_id",id);
-        PISQW.eq("object_type",3);
+        PISQW.eq("object_type",ImageSourceTypeEnum.BUSSINESSLICENSE.getCode());
         //获取到历史数据及文件先删除文件然后删除数据。
         partnerImageSourceService.remove(PISQW);
         return true;

src/main/resources/mapper/PartnerProjectInfoMapper.xml

@@ -93,6 +93,7 @@
         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}
+        order by status desc
     </select>
 
     <select id= "getToDoListInfoVO"  parameterType="Integer" resultType="com.partner.admin.VO.PartnerProjectInfoListVO">
@@ -171,7 +172,7 @@
                              investment_promotion_company,phone,one_project_investment_total,one_project_investment_regular
     </select>
 
-    <select id= "getTemplateContent"  parameterType="Integer" resultType="com.partner.admin.VO.PartnerTemplateVO">
+    <select id= "getProjectConfirmTemplate"  parameterType="Integer" resultType="com.partner.admin.VO.ProjectConfirmTemplateVO">
         select ppi.id,su.phonenumber person,c.ent_name investment_subject,
         c.reg_location,pi.invest_amount project_investment_total,
         ppi.decision_maker,ppi.decision_maker_position
@@ -181,4 +182,15 @@
         left join sys_user su on su.user_id = ppi.partner_id
         where ppi.id = #{id}
     </select>
+
+    <select id= "getCommissionConfirmTemplate"  parameterType="Integer" resultType="com.partner.admin.VO.ProjectConfirmTemplateVO">
+        select ppi.id,su.phonenumber person,c.ent_name investment_subject,
+               c.reg_location,pi.invest_amount project_investment_total,
+               ppi.decision_maker,ppi.decision_maker_position
+        from partner_project_info ppi
+                 left join project_info pi  on ppi.project_id = pi.id
+                 left join company c on c.id = pi.cid
+                 left join sys_user su on su.user_id = ppi.partner_id
+        where ppi.id = #{id}
+    </select>
 </mapper>

src/main/resources/mapper/PartnerSecretaryBindMapper.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.PartnerSecretaryBindMapper">
+
+    <resultMap id="BaseResultMap" type="com.partner.admin.domain.PartnerSecretaryBind">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="userId" column="user_id" jdbcType="INTEGER"/>
+            <result property="secretaryId" column="secretary_id" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,user_id,secretary_id
+    </sql>
+</mapper>