suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
This commit is contained in:
俞扬
2023-06-21 10:25:03 +08:00
parent 57af6a656b 60315342d5
commit b9c9bc2bae
51 changed files with 551 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java
View File

@@ -62,4 +62,18 @@ public class PartnerLineInfoAndBaseInfoDTO {
@ApiModelProperty("通过证明")
private String passCertifyFile;
private Integer lineStatus;
@ApiModelProperty("常驻区域")
private String liveArea;
@ApiModelProperty("意向开店区域")
private String wantShopArea;
@ApiModelProperty("意向开店区域名称")
private String wantShopAreaName;
@ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
private Integer acceptAdjustType;
}

2
coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewDO.java
View File

@@ -67,7 +67,7 @@ public class HyPartnerInterviewDO implements Serializable {
private Date passTime;
@ApiModelProperty("有效期")
private Date expiryDate;
private String expiryDate;
@ApiModelProperty("最近的日志消息")
private String latestLogMessage;

5
coolstore-partner-model/src/main/java/com/cool/store/request/QueryByInterviewPlanIdReq.java
View File

@@ -12,6 +12,9 @@ import lombok.Data;
@Data
@ApiModel
public class QueryByInterviewPlanIdReq {
@ApiModelProperty("会议编号")
@ApiModelProperty("会议计划编号")
private String interviewPlanId;
@ApiModelProperty(value = "是否是需要查询战区主管的页面", required = true)
private Boolean needDevelopmentDirector;
}

3
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java
View File

@@ -37,6 +37,9 @@ public class PartnerIntentInfoVO {
@ApiModelProperty("意向开店区域")
private String wantShopArea;
@ApiModelProperty("意向开店区域名称")
private String wantShopAreaName;
@ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
private Integer acceptAdjustType;

7
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineBaseInfoVO.java
View File

@@ -1,5 +1,7 @@
package com.cool.store.vo;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,6 +24,9 @@ public class PartnerLineBaseInfoVO {
@ApiModelProperty("hy_partner_user_info.partner_id")
private String partnerId;
@ApiModelProperty("hy_partner_line_info.id")
private Long partnerLineId;
@ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同")
private String workflowStage;
@@ -29,9 +34,11 @@ public class PartnerLineBaseInfoVO {
private String workflowStatus;
@ApiModelProperty("当前阶段截止时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date deadline;
@ApiModelProperty("结束跟进时间 冷静期使用 计算15天还剩多少天")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date closeTime;
@ApiModelProperty("冷静期首次登录标识 true-是首次")

14
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java
View File

@@ -49,7 +49,7 @@ public class PartnerLineInfoAndBaseInfoVO {
private String investmentManagerPhone;
@ApiModelProperty("用户画像")
private String userPortrait;
private List<String> userPortrait;
@ApiModelProperty("线索状态")
private Integer lineStatus;
@@ -68,4 +68,16 @@ public class PartnerLineInfoAndBaseInfoVO {
@ApiModelProperty("通过证明")
private List<String> passCertifyFile;
@ApiModelProperty("常驻区域")
private String liveArea;
@ApiModelProperty("意向开店区域")
private String wantShopArea;
@ApiModelProperty("意向开店区域名称")
private String wantShopAreaName;
@ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
private Integer acceptAdjustType;
}

6
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java
View File

@@ -31,11 +31,11 @@ public class PartnerUserInfoVO {
@ApiModelProperty("常驻区域")
private String liveArea;
@ApiModelProperty("意向开店区域")
@ApiModelProperty("意向开店区域ID")
private String wantShopArea;
@ApiModelProperty("意向开店区域ID")
private Long wantShopAreaId;
@ApiModelProperty("意向开店区域名称")
private String wantShopAreaName;
@ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
private Integer acceptAdjustType;

3
coolstore-partner-model/src/main/java/com/cool/store/vo/PublicSeaLineListVo.java
View File

@@ -39,8 +39,9 @@ public class PublicSeaLineListVo {
@ApiModelProperty("手机号归属地")
private String phoneAddress;
@ApiModelProperty("创建时间")
private Date createTime;
private String createTime;
@ApiModelProperty("面试开始时间")
private Date partnerInterviewStartTime;

7
coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java
View File

@@ -1,5 +1,6 @@
package com.cool.store.vo.interview;
import com.cool.store.entity.EnterpriseUserDO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -108,4 +109,10 @@ public class InterviewVO {
@ApiModelProperty("飞书日程id")
private String feishuScheduleId;
@ApiModelProperty("开发主管信息")
private EnterpriseUserDO developmentDirector;
@ApiModelProperty("所属战区id")
private String affiliationZone;
}