1、优化学历字典

2、优化后台管理人员简历

menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/eduexp/EducationTypeEnum.java

@@ -4,17 +4,17 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 学历类型（0初中及以下 | 1中专/中技 | 2高中 | 3大专 | 4 本科 5 硕士 6 博士 99 其他）
+ * 学历类型（0初中及以下 | 1中专/中技 | 2高中 | 3大专及以下 | 4 本科 5 硕士 6 博士 99 其他）
  **/
 @Getter
 @AllArgsConstructor
 public enum EducationTypeEnum {
 
 
-    PRIMARY_SCHOOL("0","初中及以下"),
-    JUNIOR_HIGH_SCHOOL("1","中专/中技"),
-    HIGH_SCHOOL("2","高中"),
-    COLLEGE("3","大专"),
+//    PRIMARY_SCHOOL("0","初中及以下"),
+//    JUNIOR_HIGH_SCHOOL("1","中专/中技"),
+//    HIGH_SCHOOL("2","高中"),
+    COLLEGE("3","大专及以下"),
     BACHELOR("4","本科"),
     MASTER("5","硕士"),
     DOCTOR("6","博士"),
@@ -34,7 +34,7 @@ public enum EducationTypeEnum {
                 return educationTypeEnum;
             }
         }
-        return PRIMARY_SCHOOL;
+        return COLLEGE;
     }
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/interview/InterviewInviteController.java

@@ -7,6 +7,8 @@ import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.framework.excel.core.util.ExcelUtils;
+import com.citu.module.menduner.system.controller.app.jobhunt.interview.vo.AppInterviewInvitePageReqVO;
+import com.citu.module.menduner.system.controller.base.interview.InterviewInviteDetailRespVO;
 import com.citu.module.menduner.system.controller.base.interview.InterviewInvitePageReqVO;
 import com.citu.module.menduner.system.controller.base.interview.InterviewInviteRespVO;
 import com.citu.module.menduner.system.controller.base.interview.InterviewInviteSaveReqVO;
@@ -73,9 +75,9 @@ public class InterviewInviteController {
     @GetMapping("/page")
     @Operation(summary = "获得面试邀请分页")
     @PreAuthorize("@ss.hasPermission('menduner:system:interview-invite:query')")
-    public CommonResult<PageResult<InterviewInviteRespVO>> getInterviewInvitePage(@Valid InterviewInvitePageReqVO pageReqVO) {
-        PageResult<InterviewInviteDO> pageResult = interviewInviteService.getInterviewInvitePage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, InterviewInviteRespVO.class));
+    public CommonResult<PageResult<InterviewInviteDetailRespVO>> page(@Valid InterviewInvitePageReqVO reqVO) {
+        AppInterviewInvitePageReqVO req = BeanUtils.toBean(reqVO, AppInterviewInvitePageReqVO.class);
+        return success(interviewInviteService.page(req, reqVO.getUserId()));
     }
 
     @GetMapping("/export-excel")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/interview/AppInterviewInviteController.java

@@ -2,7 +2,9 @@ package com.citu.module.menduner.system.controller.app.jobhunt.interview;
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import com.citu.module.menduner.system.controller.app.jobhunt.interview.vo.AppInterviewInvitePageReqVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.interview.vo.AppInterviewInviteRespVO;
 import com.citu.module.menduner.system.controller.app.recruit.interview.vo.AppRecruitInterviewInviteReqConsentVO;
@@ -40,7 +42,7 @@ public class AppInterviewInviteController {
     @GetMapping("/page")
     @Operation(summary = "获取面试日程分页")
     public CommonResult<PageResult<AppInterviewInviteRespVO>> page(@Valid AppInterviewInvitePageReqVO reqVO) {
-        return success(service.page(reqVO));
+        return success(BeanUtils.toBean(service.page(reqVO, LoginUserContext.getUserId()), AppInterviewInviteRespVO.class));
     }
 
     @PreAuthenticated
@@ -48,7 +50,7 @@ public class AppInterviewInviteController {
     @Operation(summary = "根据邀请人id获取面试邀约列表")
     public CommonResult<List<AppInterviewInviteRespVO>> getListByInviteUserId
             (@PathVariable("inviteUserId") Long inviteUserId) {
-        return success(service.getListByInviteUserId(inviteUserId));
+        return success(BeanUtils.toBean(service.getListByInviteUserId(inviteUserId), AppInterviewInviteRespVO.class));
     }
 
     @PreAuthenticated

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/interview/vo/AppInterviewInviteRespVO.java

@@ -1,29 +1,10 @@
 package com.citu.module.menduner.system.controller.app.jobhunt.interview.vo;
 
-import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserContactRespVO;
-import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseBaseSimpleRespVO;
-import com.citu.module.menduner.system.controller.base.interview.InterviewInviteRespVO;
-import com.citu.module.menduner.system.controller.base.job.JobAdvertisedSimpleRespVO;
+import com.citu.module.menduner.system.controller.base.interview.InterviewInviteDetailRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.time.LocalDateTime;
-
 @Schema(description = "menduner - 面试日程 Response VO")
 @Data
-public class AppInterviewInviteRespVO extends InterviewInviteRespVO {
-
-    @Schema(description = "更新时间")
-    private LocalDateTime updateTime;
-
-    @Schema(description = "联系人信息")
-    private EnterpriseUserContactRespVO contact;
-
-    @Schema(description = "招聘职位信息")
-    private JobAdvertisedSimpleRespVO job;
-
-    @Schema(description = "招聘企业信息")
-    private EnterpriseBaseSimpleRespVO enterprise;
-
-
+public class AppInterviewInviteRespVO extends InterviewInviteDetailRespVO {
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/recruit/job/vo/AppRecruitJobSaveReqVO.java

@@ -18,7 +18,7 @@ public class AppRecruitJobSaveReqVO {
     private Long id;
 
     @Schema(description = "工作地区", requiredMode = Schema.RequiredMode.REQUIRED, example = "25976")
-    @NotNull(message = "{1_100_004_003}")
+//    @NotNull(message = "{1_100_004_003}")
     private Long areaId;
 
     @Schema(description = "职位名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/bind/EnterpriseUserBindSaveReqVO.java

@@ -1,12 +1,10 @@
 package com.citu.module.menduner.system.controller.base.enterprise.bind;
 
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 import javax.validation.constraints.*;
-import java.time.LocalDateTime;
 
 @Schema(description = "企业登录用户新增/修改 Request VO")
 @Data
@@ -42,19 +40,6 @@ public class EnterpriseUserBindSaveReqVO {
     @Schema(description = "用户邮箱")
     private String email;
 
-    @Schema(description = "帐号状态（0正常 1停用 2 等待审核 3不通过）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotBlank(message = "{1_099_000_001}")
-    private String status;
-
-    @Schema(description = "密码")
-    private String password;
-
-    @Schema(description = "最后登录IP")
-    private String loginIp;
-
-    @Schema(description = "最后登录时间")
-    private LocalDateTime loginDate;
-
     @Schema(description = "用户类型（0普通企业用户 1 企业管理员）", example = "2")
     private String userType;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/vo/EnterpriseDetailRespVO.java

@@ -2,10 +2,13 @@ package com.citu.module.menduner.system.controller.base.enterprise.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.citu.module.menduner.system.controller.base.enterprise.address.EnterpriseAddressRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.business.EnterpriseBusinessRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.List;
+
 @Schema(description = "企业信息详情 Response VO")
 @Data
 @ExcelIgnoreUnannotated
@@ -16,4 +19,7 @@ public class EnterpriseDetailRespVO extends EnterpriseRespVO {
 
     @Schema(description = "企业工商信息", example = "16657")
     private EnterpriseBusinessRespVO businessResp;
+
+    @Schema(description = "企业地址信息")
+    private List<EnterpriseAddressRespVO> addressList;
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/vo/EnterpriseRespVO.java

@@ -116,6 +116,14 @@ public class EnterpriseRespVO {
     @ExcelProperty(value = "允许企业发布哪些职位类型", converter = JsonConvert.class)
     private List<String> pubJobTypePerm;
 
+    @Schema(description = "vip标识")
+    @ExcelProperty("vip标识")
+    private String vipFlag;
+
+    @Schema(description = "vip过期时间")
+    @ExcelProperty("vip过期时间")
+    private LocalDateTime vipExpireDate;
+
     @Schema(description = "状态（0正常 1停用）")
     @ExcelProperty("状态")
     private String status;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/interview/InterviewInviteDetailRespVO.java

@@ -0,0 +1,28 @@
+package com.citu.module.menduner.system.controller.base.interview;
+
+import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserContactRespVO;
+import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseBaseSimpleRespVO;
+import com.citu.module.menduner.system.controller.base.job.JobAdvertisedSimpleRespVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "menduner - 面试日程 Response VO")
+@Data
+public class InterviewInviteDetailRespVO extends InterviewInviteRespVO {
+
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+    @Schema(description = "联系人信息")
+    private EnterpriseUserContactRespVO contact;
+
+    @Schema(description = "招聘职位信息")
+    private JobAdvertisedSimpleRespVO job;
+
+    @Schema(description = "招聘企业信息")
+    private EnterpriseBaseSimpleRespVO enterprise;
+
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/job/JobAdvertisedDO.java

@@ -41,6 +41,7 @@ public class JobAdvertisedDO extends TenantBaseDO {
     /**
      * 工作地区
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private Long areaId;
     /**
      * 职位名称
@@ -103,6 +104,7 @@ public class JobAdvertisedDO extends TenantBaseDO {
     /**
      * 工作地址
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private String address;
     /**
      * 经度

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/interview/InterviewInviteMapper.java

@@ -6,13 +6,12 @@ import com.citu.framework.mybatis.core.mapper.BaseMapperX;
 import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.citu.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.citu.module.menduner.system.controller.app.jobhunt.interview.vo.AppInterviewInvitePageReqVO;
-import com.citu.module.menduner.system.controller.app.jobhunt.interview.vo.AppInterviewInviteRespVO;
+import com.citu.module.menduner.system.controller.base.interview.InterviewInviteDetailRespVO;
 import com.citu.module.menduner.system.controller.app.recruit.interview.vo.AppRecruitInterviewInviteReqPageVO;
 import com.citu.module.menduner.system.controller.app.recruit.interview.vo.AppRecruitInterviewInviteRespVO;
 import com.citu.module.menduner.system.controller.base.CommonRespVO;
 import com.citu.module.menduner.system.controller.base.analysis.RecruitAnalysisPageReqVO;
 import com.citu.module.menduner.system.controller.base.analysis.RecruitInterviewInviteAnalysisRespVO;
-import com.citu.module.menduner.system.controller.base.analysis.RecruitJobAnalysisRespVO;
 import com.citu.module.menduner.system.controller.base.interview.InterviewInvitePageReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseTalentPoolDO;
@@ -57,11 +56,11 @@ public interface InterviewInviteMapper extends BaseMapperX<InterviewInviteDO> {
      * @param inviteUserId 邀请用户id
      * @param userId       受邀用户id
      **/
-    default List<AppInterviewInviteRespVO> getListByInviteUserId(Long inviteUserId, Long userId) {
+    default List<InterviewInviteDetailRespVO> getListByInviteUserId(Long inviteUserId, Long userId) {
         MPJLambdaWrapperX<InterviewInviteDO> query = new MPJLambdaWrapperX<>();
         query.selectAll(InterviewInviteDO.class);
-        query.selectAssociation(JobAdvertisedDO.class, AppInterviewInviteRespVO::getJob);
-        query.selectAssociation(EnterpriseDO.class, AppInterviewInviteRespVO::getEnterprise);
+        query.selectAssociation(JobAdvertisedDO.class, InterviewInviteDetailRespVO::getJob);
+        query.selectAssociation(EnterpriseDO.class, InterviewInviteDetailRespVO::getEnterprise);
 
         query.innerJoin(JobAdvertisedDO.class, JobAdvertisedDO::getId, InterviewInviteDO::getJobId);
         query.innerJoin(EnterpriseDO.class, EnterpriseDO::getId, JobAdvertisedDO::getEnterpriseId);
@@ -71,18 +70,18 @@ public interface InterviewInviteMapper extends BaseMapperX<InterviewInviteDO> {
 
         query.orderByDesc(InterviewInviteDO::getUpdateTime);
 
-        return selectJoinList(AppInterviewInviteRespVO.class, query);
+        return selectJoinList(InterviewInviteDetailRespVO.class, query);
     }
 
 
     /**
      * 求职端 面试邀约列表分页
      **/
-    default PageResult<AppInterviewInviteRespVO> page(AppInterviewInvitePageReqVO reqVO, Long userId) {
+    default PageResult<InterviewInviteDetailRespVO> page(AppInterviewInvitePageReqVO reqVO, Long userId) {
         MPJLambdaWrapperX<InterviewInviteDO> query = new MPJLambdaWrapperX<>();
         query.selectAll(InterviewInviteDO.class);
-        query.selectAssociation(JobAdvertisedDO.class, AppInterviewInviteRespVO::getJob);
-        query.selectAssociation(EnterpriseDO.class, AppInterviewInviteRespVO::getEnterprise);
+        query.selectAssociation(JobAdvertisedDO.class, InterviewInviteDetailRespVO::getJob);
+        query.selectAssociation(EnterpriseDO.class, InterviewInviteDetailRespVO::getEnterprise);
 
         query.innerJoin(JobAdvertisedDO.class, JobAdvertisedDO::getId, InterviewInviteDO::getJobId);
         query.innerJoin(EnterpriseDO.class, EnterpriseDO::getId, JobAdvertisedDO::getEnterpriseId);
@@ -98,7 +97,7 @@ public interface InterviewInviteMapper extends BaseMapperX<InterviewInviteDO> {
 
         query.orderByDesc(InterviewInviteDO::getUpdateTime);
 
-        return selectJoinPage(reqVO, AppInterviewInviteRespVO.class, query);
+        return selectJoinPage(reqVO, InterviewInviteDetailRespVO.class, query);
     }
 
     /**

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/MdeOldSyncService.java

@@ -85,8 +85,8 @@ public class MdeOldSyncService {
         put("2", EducationTypeEnum.MASTER.getType());
         put("3", EducationTypeEnum.BACHELOR.getType());
         put("4", EducationTypeEnum.COLLEGE.getType());
-        put("6", EducationTypeEnum.HIGH_SCHOOL.getType());
-        put("7", EducationTypeEnum.JUNIOR_HIGH_SCHOOL.getType());
+        put("6", EducationTypeEnum.COLLEGE.getType());
+        put("7", EducationTypeEnum.COLLEGE.getType());
         put("10", EducationTypeEnum.OTHER.getType());
     }};
     @Resource

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseServiceImpl.java

@@ -1,10 +1,12 @@
 package com.citu.module.menduner.system.service.enterprise;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
+import com.citu.framework.common.util.object.ObjectUtils;
 import com.citu.framework.datapermission.core.annotation.DataPermission;
 import com.citu.framework.dict.core.DictFrameworkUtils;
 import com.citu.module.menduner.common.dto.TimeRangeBaseReqVO;
@@ -14,6 +16,7 @@ import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppE
 import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppEnterpriseDetailRespVO;
 import com.citu.module.menduner.system.controller.app.recruit.enterprise.vo.*;
 import com.citu.module.menduner.system.controller.base.CommonRespVO;
+import com.citu.module.menduner.system.controller.base.enterprise.address.EnterpriseAddressRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.vo.*;
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseAddressDO;
@@ -30,6 +33,7 @@ import com.citu.module.menduner.system.enums.visits.MdeVisitsEnum;
 import com.citu.module.menduner.system.mq.producer.ESProducer;
 import com.citu.module.menduner.system.mq.producer.GraphProducer;
 import com.citu.module.menduner.system.mq.producer.MdeVisitsProducer;
+import com.citu.module.menduner.system.service.enterprise.address.EnterpriseAddressService;
 import com.citu.module.menduner.system.service.industry.IndustryService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.CacheEvict;
@@ -80,6 +84,9 @@ public class EnterpriseServiceImpl implements EnterpriseService {
     @Resource
     private IndustryService industryService;
 
+    @Resource
+    private EnterpriseAddressService addressService;
+
 
     @Override
     @CacheEvict(cacheNames = {
@@ -141,7 +148,14 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 
     @Override
     public PageResult<EnterpriseDetailRespVO> page(EnterprisePageReqVO pageReqVO) {
-        return enterpriseMapper.page(pageReqVO);
+        PageResult<EnterpriseDetailRespVO> result = enterpriseMapper.page(pageReqVO);
+        result.getList().forEach(item -> {
+            List<EnterpriseAddressDO> addressList = addressService.getEnterpriseAddressList(item.getId());
+            if(ObjectUtil.isNotEmpty(addressList)) {
+                item.setAddressList(BeanUtils.toBean(addressList, EnterpriseAddressRespVO.class));
+            }
+        });
+        return result;
     }
 
     @Override
@@ -450,8 +464,8 @@ public class EnterpriseServiceImpl implements EnterpriseService {
             enterpriseDO.setFirst(false);
             enterpriseMapper.updateById(enterpriseDO);
         }
-        if (null == enterpriseDO.getBizFlag() || enterpriseDO.getBizFlag()) {
-            enterpriseDO.setFirst(true);
+        if (null == enterpriseDO.getBizFlag() || !enterpriseDO.getBizFlag()) {
+            enterpriseDO.setBizFlag(true);
             enterpriseMapper.updateById(enterpriseDO);
         }
         return resp;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/address/EnterpriseAddressService.java

@@ -7,6 +7,7 @@ import com.citu.module.menduner.system.controller.base.enterprise.address.Enterp
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseAddressDO;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 企业地址 Service 接口
@@ -53,4 +54,8 @@ public interface EnterpriseAddressService {
      */
     PageResult<EnterpriseAddressDO> getEnterpriseAddressPage(EnterpriseAddressPageReqVO pageReqVO);
 
+
+    /** 根据企业id 查询企业地址列表 */
+    List<EnterpriseAddressDO> getEnterpriseAddressList(Long enterpriseId);
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/address/EnterpriseAddressServiceImpl.java

@@ -12,6 +12,8 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
+import java.util.List;
+
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_ENTERPRISE_ADDRESS_NOT_EXISTS;
 
@@ -69,4 +71,8 @@ public class EnterpriseAddressServiceImpl implements EnterpriseAddressService {
         return enterpriseAddressMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<EnterpriseAddressDO> getEnterpriseAddressList(Long enterpriseId) {
+        return enterpriseAddressMapper.selectByEnterpriseId(enterpriseId);
+    }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/interview/InterviewInviteService.java

@@ -3,7 +3,7 @@ package com.citu.module.menduner.system.service.interview;
 
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.menduner.system.controller.app.jobhunt.interview.vo.AppInterviewInvitePageReqVO;
-import com.citu.module.menduner.system.controller.app.jobhunt.interview.vo.AppInterviewInviteRespVO;
+import com.citu.module.menduner.system.controller.base.interview.InterviewInviteDetailRespVO;
 import com.citu.module.menduner.system.controller.app.recruit.interview.vo.*;
 import com.citu.module.menduner.system.controller.base.CommonRespVO;
 import com.citu.module.menduner.system.controller.base.analysis.RecruitAnalysisPageReqVO;
@@ -82,7 +82,7 @@ public interface InterviewInviteService {
      * @param reqVO 分页查询
      * @return 面试日程分页
      */
-    PageResult<AppInterviewInviteRespVO> page(AppInterviewInvitePageReqVO reqVO);
+    PageResult<InterviewInviteDetailRespVO> page(AppInterviewInvitePageReqVO reqVO,Long userId);
 
     /**
      * 根据邀请人id获取面试邀约列表
@@ -90,7 +90,7 @@ public interface InterviewInviteService {
      * @param inviteUserId 邀约人id
      * @return 面试日程列表
      */
-    List<AppInterviewInviteRespVO> getListByInviteUserId(Long inviteUserId);
+    List<InterviewInviteDetailRespVO> getListByInviteUserId(Long inviteUserId);
 
     /**
      * 获取推荐职位面试会话状态数量

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/interview/InterviewInviteServiceImpl.java

@@ -8,9 +8,8 @@ import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.framework.security.core.LoginUser;
 import com.citu.module.menduner.common.util.LoginUserContext;
 import com.citu.module.menduner.system.controller.app.jobhunt.interview.vo.AppInterviewInvitePageReqVO;
-import com.citu.module.menduner.system.controller.app.jobhunt.interview.vo.AppInterviewInviteRespVO;
+import com.citu.module.menduner.system.controller.base.interview.InterviewInviteDetailRespVO;
 import com.citu.module.menduner.system.controller.app.recruit.interview.vo.*;
-import com.citu.module.menduner.system.controller.app.recruit.unfit.AppRecruitUnfitCandidateRespVO;
 import com.citu.module.menduner.system.controller.base.CommonRespVO;
 import com.citu.module.menduner.system.controller.base.analysis.RecruitAnalysisPageReqVO;
 import com.citu.module.menduner.system.controller.base.analysis.RecruitInterviewInviteAnalysisRespVO;
@@ -179,8 +178,8 @@ public class InterviewInviteServiceImpl implements InterviewInviteService {
     }
 
     @Override
-    public PageResult<AppInterviewInviteRespVO> page(AppInterviewInvitePageReqVO reqVO) {
-        PageResult<AppInterviewInviteRespVO> result = mapper.page(reqVO, LoginUserContext.getUserId());
+    public PageResult<InterviewInviteDetailRespVO> page(AppInterviewInvitePageReqVO reqVO,Long userId) {
+        PageResult<InterviewInviteDetailRespVO> result = mapper.page(reqVO, userId);
         result.getList().forEach(resp -> {
             EnterpriseUserContactRespVO contactRespVO = userBindService
                     .getContact(resp.getEnterpriseId(), resp.getInviteUserId());
@@ -191,8 +190,8 @@ public class InterviewInviteServiceImpl implements InterviewInviteService {
     }
 
     @Override
-    public List<AppInterviewInviteRespVO> getListByInviteUserId(Long inviteUserId) {
-        List<AppInterviewInviteRespVO> result =
+    public List<InterviewInviteDetailRespVO> getListByInviteUserId(Long inviteUserId) {
+        List<InterviewInviteDetailRespVO> result =
                 mapper.getListByInviteUserId(inviteUserId, LoginUserContext.getUserId());
         result.forEach(resp -> {
             EnterpriseUserContactRespVO contactRespVO = userBindService

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/task/EnterpriseEmailNoticeTask.java

@@ -3,6 +3,7 @@ package com.citu.module.menduner.system.task;
 import cn.hutool.core.map.MapUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.citu.framework.common.util.validation.ValidationUtils;
+import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.vip.EnterpriseEntitlementRespVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseEntitlementDO;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/util/TenUtil.java

@@ -22,6 +22,8 @@ import java.util.*;
 public class TenUtil {
 
     private static final Logger log = LoggerFactory.getLogger(TenUtil.class);
+    // url参数拼接
+    private static String url = "https://service-9wsy8usn-1302482110.bj.apigw.tencentcs.com/release/ResumeParser";
 
     public static String calcAuthorization(String source, String secretId, String secretKey, String datetime)
             throws NoSuchAlgorithmException, UnsupportedEncodingException, InvalidKeyException {
@@ -50,31 +52,27 @@ public class TenUtil {
         return sb.toString();
     }
 
-    // url参数拼接
-   private  static  final   String url = "https://service-9wsy8usn-1302482110.bj.apigw.tencentcs.com/release/ResumeParser";
-
     /**
-     *
-     * @param secretId 云市场分配的密钥Id
-     * @param secretKey 云市场分配的密钥Key
-     * @param fileName  简历文件名。请务必带上正确的文件后缀名，否则部分简历可能解析失败。
-     * @param fileCount 简历文件内容（以base64编码），其中：
-                         * 1）图片简历：based64编码后大小不超过8M，最短边至少100px，支持jpg/jpeg/png/bmp/tif/gif格式。
-                         * 图片越大OCR超时风险越高，建议大小不超过4M、长宽比小于4、分辨率600*800以上；
-                         * 2）非图片简历：based64编码后大小不超过10M（注：阿里云接口是不超过8M）；
-     * @param needAvatar 是否需要解析头像，0为不需要，1为需要，默认为0。（注：解析头像会增加1倍左右耗时，如不需头像建议不开启）
+     * @param secretId      云市场分配的密钥Id
+     * @param secretKey     云市场分配的密钥Key
+     * @param fileName      简历文件名。请务必带上正确的文件后缀名，否则部分简历可能解析失败。
+     * @param fileCount     简历文件内容（以base64编码），其中：
+     *                      1）图片简历：based64编码后大小不超过8M，最短边至少100px，支持jpg/jpeg/png/bmp/tif/gif格式。
+     *                      图片越大OCR超时风险越高，建议大小不超过4M、长宽比小于4、分辨率600*800以上；
+     *                      2）非图片简历：based64编码后大小不超过10M（注：阿里云接口是不超过8M）；
+     * @param needAvatar    是否需要解析头像，0为不需要，1为需要，默认为0。（注：解析头像会增加1倍左右耗时，如不需头像建议不开启）
      * @param needSocialExp 是否需要解析实践经历，0为不需要，1为需要，默认为0：
      *                      1）若需要解析，则对“社会实践”及“在校活动”文本进行解析，解析结果放置在social_exp_objs字段中
-     * @param version  接口版本，当前取值为0和1，默认为0：
-     *                  1）version=0：仅当字段在简历中有出现，才会在json结果中返回；
-     *                   2）version=1：不管字段在简历中有无出现，均在json结果中返回，若无出现则该字段取值为空；
+     * @param version       接口版本，当前取值为0和1，默认为0：
+     *                      1）version=0：仅当字段在简历中有出现，才会在json结果中返回；
+     *                      2）version=1：不管字段在简历中有无出现，均在json结果中返回，若无出现则该字段取值为空；
      * @return
      * @throws NoSuchAlgorithmException
      * @throws UnsupportedEncodingException
      * @throws InvalidKeyException
      */
-    public static String resume(String secretId,String secretKey,String fileName,String fileCount,Integer needAvatar
-            ,Integer needSocialExp,Integer version) throws NoSuchAlgorithmException, UnsupportedEncodingException, InvalidKeyException {
+    public static String resume(String secretId, String secretKey, String fileName, String fileCount, Integer needAvatar
+            , Integer needSocialExp, Integer version) throws NoSuchAlgorithmException, UnsupportedEncodingException, InvalidKeyException {
 
         String source = "market";
         Calendar cd = Calendar.getInstance();
@@ -90,18 +88,18 @@ public class TenUtil {
         headers.put("X-Date", datetime);
         // 签名
         headers.put("Authorization", calcAuthorization(source, secretId, secretKey, datetime));
-        headers.put("Content-Type","application/json");
+        headers.put("Content-Type", "application/json");
         // 查询参数
         Map<String, String> queryParams = new HashMap<String, String>();
 
         // body参数
         Map<String, String> bodyParams = new HashMap<String, String>();
-        bodyParams.put("body","");
-        bodyParams.put("file_name",fileName);
-        bodyParams.put("file_count",fileCount);
-        bodyParams.put("need_avatar",needAvatar.toString());
-        bodyParams.put("need_social_exp",needSocialExp.toString());
-        bodyParams.put("version",version.toString());
+        bodyParams.put("body", "");
+        bodyParams.put("file_name", fileName);
+        bodyParams.put("file_count", fileCount);
+        bodyParams.put("need_avatar", needAvatar.toString());
+        bodyParams.put("need_social_exp", needSocialExp.toString());
+        bodyParams.put("version", version.toString());
 
 
         if (!queryParams.isEmpty()) {
@@ -144,7 +142,7 @@ public class TenUtil {
                 result += line;
             }
 
-           return  result;
+            return result;
         } catch (Exception e) {
             log.error(String.valueOf(e));
             e.printStackTrace();

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/person/PersonInfoServiceImplTest.java

@@ -151,7 +151,6 @@ public class PersonInfoServiceImplTest extends BaseDbUnitTest {
        reqVO.setUserId(null);
        reqVO.setName(null);
        reqVO.setSex(null);
-       reqVO.setAvatar(null);
        reqVO.setPhone(null);
        reqVO.setEmail(null);
        reqVO.setWxCode(null);