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

Merge remote-tracking branch 'origin/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727

Browse Source 
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
This commit is contained in:
俞扬
2023-07-20 19:20:20 +08:00
parent 4e97ea41e8 f6006afcb1
commit 8440f9d0ae
69 changed files with 2588 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,7 @@ public class EnterpriseUserDTO implements Serializable {
private String remark;
@ApiModelProperty("用户主键id")
private String id;
private Long id;
@ApiModelProperty("钉钉用户id")
private String userId;
@@ -106,7 +106,6 @@ public class EnterpriseUserDTO implements Serializable {
List<EnterpriseUserDO> resultList = new ArrayList<>();
for (EnterpriseUserDTO user : userList) {
EnterpriseUserDO enterpriseUserDO = new EnterpriseUserDO();
enterpriseUserDO.setId(UUIDUtils.get32UUID());
enterpriseUserDO.setUserId(user.getUserId());
enterpriseUserDO.setName(user.getName());
enterpriseUserDO.setRemark(user.getRemark());
@@ -155,7 +154,6 @@ public class EnterpriseUserDTO implements Serializable {
public static EnterpriseUserDO transUserDtoToDo(EnterpriseUserDTO user, Map<String, String> regionPathMap, Multimap<String, String> leaderDeptMap, FSEventTypeEnum eventType) {
EnterpriseUserDO enterpriseUserDO = new EnterpriseUserDO();
enterpriseUserDO.setId(UUIDUtils.get32UUID());
enterpriseUserDO.setUserId(user.getUserId());
enterpriseUserDO.setName(user.getName());
enterpriseUserDO.setRemark(user.getRemark());

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

@@ -205,8 +205,8 @@ public class SysDepartmentDTO {
region.setLeaderUserId(dept.getLeaderUserId());
region.setOrderNum(dept.getDepartOrder());
region.setThirdDeptId(dept.getId());
region.setCreateTime(System.currentTimeMillis());
region.setUpdateTime(System.currentTimeMillis());
region.setCreateTime(new Date());
region.setUpdateTime(new Date());
List<String> pathIds = new ArrayList<>();
pathIds.add(region.getRegionId());
String parentId = parentMap.get(region.getRegionId());
@@ -238,8 +238,8 @@ public class SysDepartmentDTO {
region.setLeaderUserId(dept.getLeaderUserId());
region.setOrderNum(dept.getDepartOrder());
region.setThirdDeptId(dept.getId());
region.setCreateTime(System.currentTimeMillis());
region.setUpdateTime(System.currentTimeMillis());
region.setCreateTime(new Date());
region.setUpdateTime(new Date());
String regionPath = parentRegion.getRegionPath() + region.getRegionId() + CommonConstants.PATH_SPILT;
region.setRegionPath(regionPath);
region.setDeleted(Boolean.FALSE);
@@ -260,8 +260,8 @@ public class SysDepartmentDTO {
region.setLeaderUserId(dept.getLeaderUserId());
region.setOrderNum(dept.getDepartOrder());
region.setThirdDeptId(dept.getId());
region.setCreateTime(System.currentTimeMillis());
region.setUpdateTime(System.currentTimeMillis());
region.setCreateTime(new Date());
region.setUpdateTime(new Date());
region.setDeleted(Boolean.FALSE);
if(CollectionUtils.isNotEmpty(dept.getDeptManagerUseridList())){
for (String leader : dept.getDeptManagerUseridList()) {

25
coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/interview/InspectionRevocationDTO.java Normal file
View File

@@ -0,0 +1,25 @@
package com.cool.store.dto.inspection.interview;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author Fun Li
* @version 1.0
* @date 2023/7/19 17:47
*/
@Data
public class InspectionRevocationDTO {
@ApiModelProperty("稽核信息Id")
private Long inspectionId;
@ApiModelProperty("操作说明")
private String description;
@ApiModelProperty("多凭证文件链接集合")
private List<String> files;
}

29
coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/interview/InspectionSubmissionDTO.java Normal file
View File

@@ -0,0 +1,29 @@
package com.cool.store.dto.inspection.interview;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author Fun Li
* @version 1.0
* @date 2023/7/19 17:05
*/
@Data
public class InspectionSubmissionDTO {
@ApiModelProperty(value = "稽核信息表id", required = true)
private Long inspectionId;
@ApiModelProperty(value = "是否合格，0为不合格，1为合格", required = true)
private Integer whetherPass;
@ApiModelProperty("稽核说明，仅当不合格时为必传项")
private String description;
@ApiModelProperty("稽核多凭证文件链接")
private List<String> files;
}

23
coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/CheckInspectionSettingDTO.java Normal file
View File

@@ -0,0 +1,23 @@
package com.cool.store.dto.inspection.setting;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author zhangchenbiao
* @FileName: DeleteInspectionSettingDTO
* @Description: 删除稽核区域设置
* @date 2023-07-17 14:41
*/
@Data
public class CheckInspectionSettingDTO {
@ApiModelProperty("id")
private Long inspectionSettingId;
@ApiModelProperty("归属地ids")
private List<Long> openAreaMappingIds;
}

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

@@ -19,7 +19,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
public class EnterpriseUserDO implements Serializable {
@ApiModelProperty("用户主键id")
private String id;
private Long id;
@ApiModelProperty("用户id")
private String userId;

57
coolstore-partner-model/src/main/java/com/cool/store/entity/HyInspectionDO.java Normal file
View File

@@ -0,0 +1,57 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class HyInspectionDO {
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("面试计划Id")
private Long interviewPlanId;
@ApiModelProperty("稽核人user_id")
private String operatorUserId;
@ApiModelProperty("稽核类型，0面试稽核，后续可能有其他稽核")
private Integer type;
@ApiModelProperty("稽核状态（0为未稽核，1为合格，2为不合格）")
private Integer status;
@ApiModelProperty("多个凭证文件（以英文逗号分隔）")
private String files;
@ApiModelProperty("稽核说明")
private String description;
@ApiModelProperty("稽核时间")
private String inspectionTime;
@ApiModelProperty("enterprise_user.user_id，创建人")
private String creator;
@ApiModelProperty("enterprise_user.user_id，修改人")
private String updator;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("是否删除（0表示未删除，1表示删除）")
private Boolean deleted;
@ApiModelProperty("创建时间")
private String createTime;
@ApiModelProperty("修改时间")
private String updateTime;
}

44
coolstore-partner-model/src/main/java/com/cool/store/entity/HyInspectionSettingDO.java Normal file
View File

@@ -0,0 +1,44 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @author zhangchenbiao
* @date 2023-07-18 04:27
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class HyInspectionSettingDO implements Serializable {
@ApiModelProperty("主键id")
private Long id;
@ApiModelProperty("区域名称")
private String zoneName;
@ApiModelProperty("关联稽核人user_id")
private String inspectionUserId;
@ApiModelProperty("新建人ID")
private String createUserId;
@ApiModelProperty("更新人ID")
private String updateUserId;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("修改时间")
private Date updateTime;
@ApiModelProperty("删除标识")
private Boolean deleted;
}

38
coolstore-partner-model/src/main/java/com/cool/store/entity/HyInspectionSettingMappingDO.java Normal file
View File

@@ -0,0 +1,38 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @author zhangchenbiao
* @date 2023-07-18 04:28
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class HyInspectionSettingMappingDO implements Serializable {
@ApiModelProperty("主键id")
private Long id;
@ApiModelProperty("稽核区域配置表id,hy_inspection_setting.id")
private Long inspectionSettingId;
@ApiModelProperty("hy_open_area_info.id")
private Long openAreaMappingId;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("修改时间")
private Date updateTime;
@ApiModelProperty("删除标识")
private Boolean deleted;
}

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

@@ -22,7 +22,7 @@ public class HyIntendDevelopementMappingDO implements Serializable {
private Long id;
@ApiModelProperty("hy_intend_developement_zone_info.id")
private String mappingId;
private Long mappingId;
@ApiModelProperty("hy_open_area_info.id或者区域ID")
private String openAreaMappingId;

44
coolstore-partner-model/src/main/java/com/cool/store/entity/HyInterviewInspectionLogDO.java Normal file
View File

@@ -0,0 +1,44 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class HyInterviewInspectionLogDO {
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("enterprise_user.user_id，操作人用户id")
private String operatorUserId;
@ApiModelProperty("稽核信息表id(hy_inspection.id)")
private Long inspectionId;
@ApiModelProperty("操作类型（0为合格，1为不合格，2为撤销）")
private Integer operationType;
@ApiModelProperty("操作说明")
private String description;
@ApiModelProperty("多个凭证文件，以英文逗号分隔")
private String files;
@ApiModelProperty("操作时间")
private String operationTime;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("创建时间")
private String createTime;
@ApiModelProperty("修改时间")
private String updateTime;
}

6
coolstore-partner-model/src/main/java/com/cool/store/entity/RegionDO.java
View File

@@ -2,6 +2,8 @@ package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -45,13 +47,13 @@ public class RegionDO implements Serializable {
private String thirdDeptId;
@ApiModelProperty("创建时间")
private Long createTime;
private Date createTime;
@ApiModelProperty("创建人")
private String createName;
@ApiModelProperty("更新时间")
private Long updateTime;
private Date updateTime;
@ApiModelProperty("更新人")
private String updateName;

17
coolstore-partner-model/src/main/java/com/cool/store/entity/UserRegionMappingDO.java
View File

@@ -8,6 +8,7 @@ import com.google.common.collect.Lists;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -47,13 +48,13 @@ public class UserRegionMappingDO implements Serializable {
private String createId;
@ApiModelProperty("创建时间")
private Long createTime;
private Date createTime;
@ApiModelProperty("更新人")
private String updateId;
@ApiModelProperty("更新时间")
private Long updateTime;
private Date updateTime;
public static List<UserRegionMappingDO> convertSyncDO(String regionId, List<EnterpriseUserDTO> departmentUsers){
if(CollectionUtils.isEmpty(departmentUsers)){
@@ -65,8 +66,8 @@ public class UserRegionMappingDO implements Serializable {
userRegion.setRegionId(regionId);
userRegion.setUserId(departmentUser.getUserId());
userRegion.setType(DataSourceEnum.SYNC.getCode());
userRegion.setCreateTime(System.currentTimeMillis());
userRegion.setUpdateTime(System.currentTimeMillis());
userRegion.setCreateTime(new Date());
userRegion.setUpdateTime(new Date());
userRegion.setDeleted(Boolean.FALSE);
resultList.add(userRegion);
}
@@ -83,8 +84,8 @@ public class UserRegionMappingDO implements Serializable {
userRegion.setRegionId(regionId);
userRegion.setUserId(userId);
userRegion.setType(DataSourceEnum.SYNC.getCode());
userRegion.setCreateTime(System.currentTimeMillis());
userRegion.setUpdateTime(System.currentTimeMillis());
userRegion.setCreateTime(new Date());
userRegion.setUpdateTime(new Date());
userRegion.setDeleted(Boolean.FALSE);
resultList.add(userRegion);
}
@@ -111,8 +112,8 @@ public class UserRegionMappingDO implements Serializable {
userRegion.setRegionId(split[split.length-1]);
userRegion.setUserId(user.getUserId());
userRegion.setType(DataSourceEnum.SYNC.getCode());
userRegion.setCreateTime(System.currentTimeMillis());
userRegion.setUpdateTime(System.currentTimeMillis());
userRegion.setCreateTime(new Date());
userRegion.setUpdateTime(new Date());
userRegion.setDeleted(Boolean.FALSE);
resultList.add(userRegion);
}

44
coolstore-partner-model/src/main/java/com/cool/store/request/GetInterviewInspectionListReq.java Normal file
View File

@@ -0,0 +1,44 @@
package com.cool.store.request;
import com.cool.store.common.PageBasicInfo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author: hxd
* @Date: 2023-06-06 15:50
* @Description:
*/
@Data
@ApiModel
public class GetInterviewInspectionListReq extends PageBasicInfo {
@ApiModelProperty("搜索类型")
private String searchType;
@ApiModelProperty("搜索内容")
private String searchContent;
@ApiModelProperty("稽核状态（0为未稽核，1为合格，2为不合格）")
private Integer status;
@ApiModelProperty("意向开店区域")
private String wantShopArea;
@ApiModelProperty("面试开始时间")
private String startTime;
@ApiModelProperty("面试结束时间")
private String endTime;
private String userId;
}

41
coolstore-partner-model/src/main/java/com/cool/store/request/GetInterviewInspectionResultListReq.java Normal file
View File

@@ -0,0 +1,41 @@
package com.cool.store.request;
import com.cool.store.common.PageBasicInfo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author: hxd
* @Date: 2023-06-06 15:50
* @Description:
*/
@Data
@ApiModel
public class GetInterviewInspectionResultListReq extends PageBasicInfo {
@ApiModelProperty("搜索类型")
private String searchType;
@ApiModelProperty("搜索内容")
private String searchContent;
@ApiModelProperty("稽核状态（0为未稽核，1为合格，2为不合格）")
private Integer status;
@ApiModelProperty("意向开店区域")
private String wantShopArea;
@ApiModelProperty("面试开始时间")
private String startTime;
@ApiModelProperty("面试结束时间")
private String endTime;
}

52
coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingCheckVO.java Normal file
View File

@@ -0,0 +1,52 @@
package com.cool.store.vo.inspection.setting;
import com.cool.store.entity.HyInspectionSettingDO;
import com.cool.store.entity.HyInspectionSettingMappingDO;
import com.google.common.collect.Lists;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.collections4.CollectionUtils;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
* @author zhangchenbiao
* @FileName: InspectionSettingPageVO
* @Description:
* @date 2023-07-17 14:32
*/
@Data
public class InspectionSettingCheckVO {
@ApiModelProperty("区域名称")
private String zoneName;
@ApiModelProperty("省市区")
private String areaName;
@ApiModelProperty("稽核人名称")
private String inspectionUsername;
public static List<InspectionSettingCheckVO> convertVO(List<HyInspectionSettingMappingDO> conflictInspectionSetting, List<HyInspectionSettingDO> inspectionSettingList, Map<String, String> userNameMap, Map<Long, String> areaNameMap){
if(CollectionUtils.isEmpty(conflictInspectionSetting) || CollectionUtils.isEmpty(inspectionSettingList)){
return Lists.newArrayList();
}
Map<Long, HyInspectionSettingDO> inspectionSettingMap = inspectionSettingList.stream().collect(Collectors.toMap(k -> k.getId(), Function.identity()));
List<InspectionSettingCheckVO> resultList = new ArrayList<>();
for (HyInspectionSettingMappingDO hyInspectionSettingMapping : conflictInspectionSetting) {
HyInspectionSettingDO inspectionSetting = inspectionSettingMap.get(hyInspectionSettingMapping.getInspectionSettingId());
if(Objects.isNull(inspectionSetting)){
continue;
}
InspectionSettingCheckVO inspectionSettingCheck = new InspectionSettingCheckVO();
inspectionSettingCheck.setInspectionUsername(userNameMap.get(inspectionSetting.getInspectionUserId()));
inspectionSettingCheck.setZoneName(inspectionSetting.getZoneName());
inspectionSettingCheck.setAreaName(areaNameMap.get(hyInspectionSettingMapping.getOpenAreaMappingId()));
resultList.add(inspectionSettingCheck);
}
return resultList;
}
}

17
coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingDetailVO.java
View File

@@ -1,10 +1,12 @@
package com.cool.store.vo.inspection.setting;
import com.cool.store.entity.HyInspectionSettingDO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
import java.util.Objects;
/**
* @author zhangchenbiao
@@ -25,9 +27,22 @@ public class InspectionSettingDetailVO {
private String inspectionUserId;
@ApiModelProperty("稽核人名称")
private String inspectionUsername;
private String inspectionUserName;
@ApiModelProperty("归属地ids")
private List<Long> openAreaMappingIds;
public static InspectionSettingDetailVO convertVO(HyInspectionSettingDO param, String inspectionUserName, List<Long> openAreaMappingIds){
if(Objects.isNull(param)){
return null;
}
InspectionSettingDetailVO result = new InspectionSettingDetailVO();
result.setInspectionSettingId(param.getId());
result.setZoneName(param.getZoneName());
result.setInspectionUserId(param.getInspectionUserId());
result.setInspectionUserName(inspectionUserName);
result.setOpenAreaMappingIds(openAreaMappingIds);
return result;
}
}

35
coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingPageVO.java
View File

@@ -1,9 +1,16 @@
package com.cool.store.vo.inspection.setting;
import com.cool.store.entity.HyInspectionSettingDO;
import com.github.pagehelper.Page;
import com.google.common.collect.Lists;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.collections4.CollectionUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* @author zhangchenbiao
@@ -24,12 +31,36 @@ public class InspectionSettingPageVO {
private String inspectionUserId;
@ApiModelProperty("稽核人名称")
private String inspectionUsername;
private String inspectionUserName;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("更新人名称")
private String updateUsername;
private String updateUserName;
/**
* dto转vo
* @param pageList
* @param userNameMap
* @return
*/
public static List<InspectionSettingPageVO> convert(Page<HyInspectionSettingDO> pageList, Map<String, String> userNameMap){
if(CollectionUtils.isEmpty(pageList)){
return Lists.newArrayList();
}
List<InspectionSettingPageVO> resultList = new ArrayList<>();
for (HyInspectionSettingDO inspectionSetting : pageList) {
InspectionSettingPageVO result = new InspectionSettingPageVO();
result.setInspectionSettingId(inspectionSetting.getId());
result.setZoneName(inspectionSetting.getZoneName());
result.setInspectionUserId(inspectionSetting.getInspectionUserId());
result.setInspectionUserName(userNameMap.get(inspectionSetting.getInspectionUserId()));
result.setUpdateTime(inspectionSetting.getUpdateTime());
result.setUpdateUserName(userNameMap.get(inspectionSetting.getUpdateUserId()));
resultList.add(result);
}
return resultList;
}
}

24
coolstore-partner-model/src/main/java/com/cool/store/vo/interview/GetInterviewInspectionHistoryListVO.java Normal file
View File

@@ -0,0 +1,24 @@
package com.cool.store.vo.interview;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List;
/**
* @Author: hxd
* @Date: 2023-06-16 13:19
* @Description:
*/
@Data
@Accessors(chain = true)
@ApiModel(description = "面试稽核历史")
public class GetInterviewInspectionHistoryListVO {
@ApiModelProperty("面试稽核历史列表")
private List<InterviewInspectionHistoryInfo> interviewInspectionHistoryInfos;
}

34
coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewInspectionHistoryInfo.java Normal file
View File

@@ -0,0 +1,34 @@
package com.cool.store.vo.interview;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* @Author: hxd
* @Date: 2023-06-16 13:19
* @Description:
*/
@ApiModel(description = "面试稽核历史详情")
@Data
public class InterviewInspectionHistoryInfo {
@ApiModelProperty(value = "操作人")
private String operatorUser;
@ApiModelProperty(value = "稽核时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date inspectionTime;
@ApiModelProperty(value = "原因")
private String description;
@ApiModelProperty(value = "凭证或者证据")
private List<String> files;
}

37
coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewInspectionInfo.java Normal file
View File

@@ -0,0 +1,37 @@
package com.cool.store.vo.interview;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
import java.util.List;
/**
* @Author: hxd
* @Date: 2023-06-08 16:26
* @Description:
*/
@Data
@Accessors(chain = true)
@ApiModel(description = "面试稽核详情信息")
public class InterviewInspectionInfo {
@ApiModelProperty(value = "稽核人")
private String auditor;
@ApiModelProperty(value = "稽核时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date inspectionTime;
@ApiModelProperty(value = "稽核结果（0为未稽核，1为合格，2为不合格，3为撤销）")
private Integer status;
@ApiModelProperty(value = "稽核说明")
private String description;
@ApiModelProperty(value = "凭证或者证据")
private List<String> files;
}

50
coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewInspectionResultVO.java Normal file
View File

@@ -0,0 +1,50 @@
package com.cool.store.vo.interview;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* @Author: HXD
* @Date: 2023-06-08 16:26
* @Description:
*/
@Data
@Accessors(chain = true)
@ApiModel(description = "面试稽核结果信息")
public class InterviewInspectionResultVO {
@ApiModelProperty(value = "被面试人姓名")
private String intervieweeName;
@ApiModelProperty(value = "被面试人手机号")
private String intervieweeMobile;
@ApiModelProperty(value = "意向开店区域")
private String wantShopAreaName;
@ApiModelProperty(value = "面试通过时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date interviewPassTime;
@ApiModelProperty(value = "稽核状态（0为未稽核，1为合格，2为不合格）")
private Integer status;
@ApiModelProperty(value = "稽核人姓名")
private String auditorName;
@ApiModelProperty(value = "稽核人电话")
private String auditorMobile;
@ApiModelProperty(value = "稽核时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date inspectionTime;
}

60
coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewInspectionVO.java Normal file
View File

@@ -0,0 +1,60 @@
package com.cool.store.vo.interview;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* @Author: HXD
* @Date: 2023-06-08 16:26
* @Description:
*/
@Data
@Accessors(chain = true)
@ApiModel(description = "面试稽核信息")
public class InterviewInspectionVO {
@ApiModelProperty(value = "面试官姓名")
private String interviewerName;
@ApiModelProperty(value = "面试官手机号")
private String interviewerMobile;
@ApiModelProperty(value = "被面试人姓名")
private String intervieweeName;
@ApiModelProperty(value = "被面试人手机号")
private String intervieweeMobile;
@ApiModelProperty(value = "意向开店区域")
private String wantShopAreaName;
@ApiModelProperty(value = "面试通过时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date interviewPassTime;
@ApiModelProperty(value = "稽核状态（0为未稽核，1为合格，2为不合格）")
private Integer status;
@ApiModelProperty(value = "稽核人姓名")
private String auditorName;
@ApiModelProperty(value = "稽核人电话")
private String auditorMobile;
@ApiModelProperty(value = "稽核时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date inspectionTime;
@ApiModelProperty(value = "稽核表id")
private Long id;
@ApiModelProperty(value = "面试计划id")
private Integer interviewPlanId;
}

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

@@ -98,7 +98,7 @@ public class InterviewVO {
private Integer status;
@ApiModelProperty(value = "面试过程信息视频URL数组", required = true)
private List<String> vedioList;
private List<String> videoList;
@ApiModelProperty(value = "面试过程信息未解析String", required = false)
private String processInfo;

89
coolstore-partner-model/src/main/java/com/cool/store/vo/region/RegionUserAndSubRegionVO.java Normal file
View File

@@ -0,0 +1,89 @@
package com.cool.store.vo.region;
import com.cool.store.entity.EnterpriseUserDO;
import com.cool.store.entity.RegionDO;
import com.google.common.collect.Lists;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
import java.util.Map;
import java.util.Objects;
/**
* @author zhangchenbiao
* @FileName: RegionUserAndSubRegionVO
* @Description:
* @date 2023-07-17 19:34
*/
@Data
public class RegionUserAndSubRegionVO {
@ApiModelProperty("区域列表")
private List<RegionInfo> regionList;
@ApiModelProperty("用户列表")
private List<UserInfo> userList;
public RegionUserAndSubRegionVO(List<RegionInfo> regionList, List<UserInfo> userList) {
this.regionList = regionList;
this.userList = userList;
}
public RegionUserAndSubRegionVO() {
this.regionList = Lists.newArrayList();
this.userList = Lists.newArrayList();
}
@Data
public static class RegionInfo{
@ApiModelProperty("区域id")
private String regionId;
@ApiModelProperty("区域名称")
private String name;
}
@Data
public static class UserInfo{
@ApiModelProperty("用户id")
private String userId;
@ApiModelProperty("用户名")
private String username;
@ApiModelProperty("手机号")
private String mobile;
@ApiModelProperty("头像url")
private String avatar;
}
public static RegionUserAndSubRegionVO convertVO(List<RegionDO> subRegionList, List<String> userIds, Map<String, EnterpriseUserDO> userMap){
List<RegionInfo> regionList = Lists.newArrayList();
List<UserInfo> userList = Lists.newArrayList();
for (RegionDO regionDO : subRegionList) {
RegionInfo region = new RegionInfo();
region.setRegionId(regionDO.getRegionId());
region.setName(regionDO.getName());
regionList.add(region);
}
for (String userId : userIds) {
EnterpriseUserDO enterpriseUser = userMap.get(userId);
if(Objects.isNull(enterpriseUser)){
continue;
}
UserInfo userInfo = new UserInfo();
userInfo.setUserId(userId);
userInfo.setUsername(enterpriseUser.getName());
userInfo.setMobile(enterpriseUser.getMobile());
userInfo.setAvatar(enterpriseUser.getAvatar());
userList.add(userInfo);
}
return new RegionUserAndSubRegionVO(regionList, userList);
}
}