Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

coolstore-partner-model/src/main/java/com/cool/store/dto/TransferLogDTO.java

@@ -0,0 +1,27 @@
+package com.cool.store.dto;
+
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/3/29 19:13
+ * @Version 1.0
+ */
+@Data
+public class TransferLogDTO {
+
+    private String fromUserId;
+
+    private String toUserId;
+
+    private String fromUserName;
+
+    private String  toUserName;
+
+    private String fromUserMobile;
+
+    private String toUserMobile;
+
+    private Integer type;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/entity/TransferLogDO.java

@@ -0,0 +1,185 @@
+package com.cool.store.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "xfsg_transfer_log")
+@Data
+public class TransferLogDO {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "line_id")
+    private Long lineId;
+
+    @Column(name = "partner_id")
+    private String partnerId;
+
+    /**
+     * 操作人
+     */
+    @Column(name = "from_user_id")
+    private String fromUserId;
+
+    /**
+     * 被分配人ID
+     */
+    @Column(name = "to_user_id")
+    private String toUserId;
+
+    /**
+     * 操作类型 1-转交 2-委托面试
+     */
+    private Integer type;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 新建人ID
+     */
+    @Column(name = "create_user_id")
+    private String createUserId;
+
+    /**
+     * 更新人ID
+     */
+    @Column(name = "update_user_id")
+    private String updateUserId;
+
+    /**
+     * @return id
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取操作人
+     *
+     * @return from_user_id - 操作人
+     */
+    public String getFromUserId() {
+        return fromUserId;
+    }
+
+    /**
+     * 设置操作人
+     *
+     * @param fromUserId 操作人
+     */
+    public void setFromUserId(String fromUserId) {
+        this.fromUserId = fromUserId;
+    }
+
+    /**
+     * 获取被分配人ID
+     *
+     * @return to_user_id - 被分配人ID
+     */
+    public String getToUserId() {
+        return toUserId;
+    }
+
+    /**
+     * 设置被分配人ID
+     *
+     * @param toUserId 被分配人ID
+     */
+    public void setToUserId(String toUserId) {
+        this.toUserId = toUserId;
+    }
+
+
+
+    /**
+     * 获取创建时间
+     *
+     * @return create_time - 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置创建时间
+     *
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取更新时间
+     *
+     * @return update_time - 更新时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置更新时间
+     *
+     * @param updateTime 更新时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取新建人ID
+     *
+     * @return create_user_id - 新建人ID
+     */
+    public String getCreateUserId() {
+        return createUserId;
+    }
+
+    /**
+     * 设置新建人ID
+     *
+     * @param createUserId 新建人ID
+     */
+    public void setCreateUserId(String createUserId) {
+        this.createUserId = createUserId;
+    }
+
+    /**
+     * 获取更新人ID
+     *
+     * @return update_user_id - 更新人ID
+     */
+    public String getUpdateUserId() {
+        return updateUserId;
+    }
+
+    /**
+     * 设置更新人ID
+     *
+     * @param updateUserId 更新人ID
+     */
+    public void setUpdateUserId(String updateUserId) {
+        this.updateUserId = updateUserId;
+    }
+}

coolstore-partner-model/src/main/java/com/cool/store/request/ChangeInvestmentRequest.java

@@ -0,0 +1,17 @@
+package com.cool.store.request;
+
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/3/29 16:04
+ * @Version 1.0
+ */
+@Data
+public class ChangeInvestmentRequest {
+
+    private String investmentManagerId;
+
+    private Long lineId;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/request/LineListRequest.java

@@ -28,5 +28,7 @@ public class LineListRequest extends PageBasicInfo {
     private Integer wantShopAreaId;
     @ApiModelProperty("线索来源")
     private Integer lineSource;
+    @ApiModelProperty("招商经理ID")
+    private String investmentManagerUserId;
 
 }

coolstore-partner-model/src/main/java/com/cool/store/request/PublicLineListRequest.java

@@ -0,0 +1,31 @@
+package com.cool.store.request;
+
+import com.cool.store.common.PageBasicInfo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/3/29 15:09
+ * @Version 1.0
+ */
+@Data
+public class PublicLineListRequest extends PageBasicInfo {
+
+    @ApiModelProperty("线索姓名")
+    private String userName;
+    @ApiModelProperty("线索手机号")
+    private String mobile;
+    @ApiModelProperty("线索创建时间_开始")
+    private String createTimeStart;
+    @ApiModelProperty("线索创建时间_结束")
+    private String createTimeEnd;
+    @ApiModelProperty("线索来源")
+    private Integer lineSource;
+    @ApiModelProperty("上一次招商经理ID")
+    private String lastInvestmentManagerUserId;
+    @ApiModelProperty("上一次招商经理ID")
+    private String lastDevelopmentManagerUserId;
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java

@@ -28,6 +28,9 @@ public class BaseInfoVO {
     @ApiModelProperty("意向加盟区域")
     private String wantShopAreaName;
 
+    @ApiModelProperty("线索状态")
+    private Integer lineStatus;
+
     @ApiModelProperty("线索标签")
     private List<LabelBaseInfoVO> userPortraitList;
 
@@ -45,6 +48,7 @@ public class BaseInfoVO {
         this.lineId = baseInfoVO.getLineId();
         this.partnerId = baseInfoVO.getPartnerId();
         this.username = baseInfoVO.getUsername();
+        this.lineStatus = baseInfoVO.getLineStatus();
         this.mobile = baseInfoVO.getMobile();
         this.workflowSubStage = baseInfoVO.getWorkflowSubStage();
         this.wantShopAreaName = baseInfoVO.getWantShopAreaName();

coolstore-partner-model/src/main/java/com/cool/store/vo/PublicLineListVO.java

@@ -0,0 +1,46 @@
+package com.cool.store.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/3/29 15:12
+ * @Version 1.0
+ */
+@Data
+public class PublicLineListVO  extends BaseInfoVO{
+
+    @ApiModelProperty("招商经理名称")
+    private String lastInvestmentManagerUserName;
+
+    @ApiModelProperty("招商经理名称")
+    private String lastDevelopmentManagerUserName;
+
+    @ApiModelProperty("线索来源名称")
+    private String lineSourceName;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+    @ApiModelProperty("更新时间")
+    private String updateTime;
+
+    @ApiModelProperty("更新人名称")
+    private String updateUserName;
+
+    public  PublicLineListVO(){}
+
+    public  PublicLineListVO(BaseInfoVO baseInfoVO) {
+        super(baseInfoVO);
+    }
+
+
+
+
+
+
+
+}