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-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
This commit is contained in:
俞扬
2023-06-17 18:19:17 +08:00
parent dcb3d1097c 4bdfc0b271
commit a3c94a6543
43 changed files with 580 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/SysDepartmentDTO.java
View File

@@ -227,4 +227,47 @@ public class SysDepartmentDTO {
}
return resultList;
}
public static RegionDO convertRegionDO(SysDepartmentDTO dept, Multimap<String, String> leaderDeptMap, RegionDO parentRegion){
RegionDO region = new RegionDO();
region.setRegionId(dept.getId());
region.setName(dept.getName());
region.setParentId(dept.getParentId());
region.setUnclassifiedFlag(CommonConstants.ZERO);
region.setLeaderUserId(dept.getLeaderUserId());
region.setOrderNum(dept.getDepartOrder());
region.setThirdDeptId(dept.getId());
region.setCreateTime(System.currentTimeMillis());
region.setUpdateTime(System.currentTimeMillis());
String regionPath = parentRegion.getRegionPath() + region.getRegionId() + CommonConstants.PATH_SPILT;
region.setRegionPath(regionPath);
region.setDeleted(Boolean.FALSE);
if(CollectionUtils.isNotEmpty(dept.getDeptManagerUseridList())){
for (String leader : dept.getDeptManagerUseridList()) {
leaderDeptMap.put(leader, dept.getId());
}
}
return region;
}
public static RegionDO convertRegionDO(SysDepartmentDTO dept, Multimap<String, String> leaderDeptMap){
RegionDO region = new RegionDO();
region.setRegionId(dept.getId());
region.setName(dept.getName());
region.setParentId(dept.getParentId());
region.setUnclassifiedFlag(CommonConstants.ZERO);
region.setLeaderUserId(dept.getLeaderUserId());
region.setOrderNum(dept.getDepartOrder());
region.setThirdDeptId(dept.getId());
region.setCreateTime(System.currentTimeMillis());
region.setUpdateTime(System.currentTimeMillis());
region.setDeleted(Boolean.FALSE);
if(CollectionUtils.isNotEmpty(dept.getDeptManagerUseridList())){
for (String leader : dept.getDeptManagerUseridList()) {
leaderDeptMap.put(leader, dept.getId());
}
}
return region;
}
}

4
coolstore-partner-model/src/main/java/com/cool/store/dto/partner/EnterInterviewDto.java
View File

@@ -6,8 +6,8 @@ import lombok.Data;
@Data
public class EnterInterviewDto {
@ApiModelProperty(value = "会议id", required = true)
private String interviewId;
@ApiModelProperty(value = "会议计划id", required = true)
private String interviewPlanId;
@ApiModelProperty(value = "用户id", required = true)
private String userId;

18
coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java
View File

@@ -50,4 +50,22 @@ public class HyPartnerUserInfoDO implements Serializable {
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("店铺编码")
private String shopCode;
@ApiModelProperty("店铺名称")
private String shopName;
@ApiModelProperty("店铺ID")
private String shopId;
@ApiModelProperty("推荐加盟商id")
private String recommendPartnerId;
@ApiModelProperty("推荐加盟商姓名")
private String recommendPartnerName;
@ApiModelProperty("推荐加盟商手机号")
private String recommendPartnerMobile;
}

18
coolstore-partner-model/src/main/java/com/cool/store/vo/EnterpriseUserBaseInfoVO.java Normal file
View File

@@ -0,0 +1,18 @@
package com.cool.store.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 员工基本信息（名字 + 电话）
*/
@Data
public class EnterpriseUserBaseInfoVO {
@ApiModelProperty("名字")
private String name;
@ApiModelProperty("电话")
private String Mobile;
}

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

@@ -15,6 +15,9 @@ import java.util.Date;
@ApiModel
public class PartnerInterviewInfoVO {
@ApiModelProperty("会议计划id")
private Long interviewPlanId;
@ApiModelProperty("会议id")
private Long interviewId;

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

@@ -18,8 +18,11 @@ public class PartnerPassLetterDetailVO {
@ApiModelProperty("审核城市")
private String verifyCity;
@ApiModelProperty("函文件URL")
private String passFileUrl;
@ApiModelProperty("函文件图片URL")
private String passImageUrl;
@ApiModelProperty("函文件pdfURL")
private String passPdfUrl;
@ApiModelProperty("生成日期：YYYY-MM-DD")
private String createTime;

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

@@ -1,19 +1,29 @@
package com.cool.store.vo.interview;
import com.alibaba.fastjson.annotation.JSONField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author: young.yu
* @Date: 2023-06-08 16:26
* @Description:
*/
@Data
@ApiModel(description = "面试信息")
public class InterviewVO {
@ApiModelProperty(value = "会议id", required = true)
private String interviewId;
@ApiModelProperty("资质审核流程id")
private String qualifyVerifyId;
@ApiModelProperty("审核通过时间")
private String passTime;
@ApiModelProperty("审核通过原因")
private String passReason;
@ApiModelProperty(value = "加盟商用户编号")
private String partnerId;
@@ -37,6 +47,22 @@ public class InterviewVO {
@ApiModelProperty(value = "面试官手机号", required = true)
private String interviewerMobile;
@ApiModelProperty(value = "记录人id", required = true)
private String recorderId;
@ApiModelProperty(value = "记录人姓名", required = true)
private String recorderName;
@ApiModelProperty(value = "记录人电话", required = true)
private String recorderMobile;
@ApiModelProperty(value = "记录时间", required = true)
private String recordTime;
@ApiModelProperty(value = "面试总结", required = true)
private String summary;
@ApiModelProperty(value = "房间状态(0待开放;1已开放;2已关闭)", required = true)
private String roomStatus;
@@ -46,100 +72,19 @@ public class InterviewVO {
@ApiModelProperty(value = "预约状态 0 待预约;1待面试;2已开始;3待审核;4审批中;5审批通过;6拒绝", required = true)
private Integer status;
@ApiModelProperty(value = "面试过程信息", required = false)
private String processInfo;
public String getPartnerId() {
return partnerId;
}
@ApiModelProperty("授权码")
private String authCode;
public void setPartnerId(String partnerId) {
this.partnerId = partnerId;
}
@ApiModelProperty("通过函有效期至")
private String expiryDate;
public String getInterviewerId() {
return interviewerId;
}
@ApiModelProperty("通过函PDF文件URL")
private String passPdfUrl;
public void setInterviewerId(String interviewerId) {
this.interviewerId = interviewerId;
}
@ApiModelProperty("通过函图片文件URL")
private String passImageUrl;
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public String getInterviewId() {
return interviewId;
}
public void setInterviewId(String interviewId) {
this.interviewId = interviewId;
}
public String getPartnerName() {
return partnerName;
}
public void setPartnerName(String partnerName) {
this.partnerName = partnerName;
}
public String getPartnerMobile() {
return partnerMobile;
}
public void setPartnerMobile(String partnerMobile) {
this.partnerMobile = partnerMobile;
}
public String getRoomId() {
return roomId;
}
public void setRoomId(String roomId) {
this.roomId = roomId;
}
public String getStartTime() {
return startTime;
}
public void setStartTime(String startTime) {
this.startTime = startTime;
}
public String getInterviewerName() {
return interviewerName;
}
public void setInterviewerName(String interviewerName) {
this.interviewerName = interviewerName;
}
public String getInterviewerMobile() {
return interviewerMobile;
}
public void setInterviewerMobile(String interviewerMobile) {
this.interviewerMobile = interviewerMobile;
}
public String getRoomStatus() {
return roomStatus;
}
public void setRoomStatus(String roomStatus) {
this.roomStatus = roomStatus;
}
public String getEndTime() {
return endTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
}