1、解决过期职位还能查询的逻辑问题

2、优化后台管理-人才基本信息

citu-framework/citu-spring-boot-starter-mybatis/src/main/java/com/citu/framework/mybatis/core/query/MPJLambdaWrapperX.java

@@ -116,6 +116,21 @@ public class MPJLambdaWrapperX<T> extends MPJLambdaWrapper<T> {
         return betweenIfPresent(column, val1, val2);
     }
 
+    public <R> MPJLambdaWrapperX<T> betweenIfPresent2(SFunction<R, ?> column, Object[] values) {
+        Object val1 = ArrayUtils.get(values, 0);
+        Object val2 = ArrayUtils.get(values, 1);
+        if (val1 != null && val2 != null) {
+            return (MPJLambdaWrapperX<T>) super.between(column, val1, val2);
+        }
+        if (val1 != null) {
+            return (MPJLambdaWrapperX<T>) ge(column, val1);
+        }
+        if (val2 != null) {
+            return (MPJLambdaWrapperX<T>) le(column, val2);
+        }
+        return this;
+    }
+
     // ========== 重写父类方法，方便链式调用 ==========
 
     @Override

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/PersonInfoController.java

@@ -6,12 +6,12 @@ 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.base.person.info.*;
+import com.citu.module.menduner.system.controller.base.userperson.UserPersonPageReqVO;
+import com.citu.module.menduner.system.controller.base.userperson.UserPersonRespVO;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonInfoDO;
 import com.citu.module.menduner.system.service.person.PersonIntegrationService;
 import com.citu.module.menduner.system.service.person.info.PersonInfoService;
-import com.citu.module.menduner.system.controller.base.person.info.PersonInfoPageReqVO;
-import com.citu.module.menduner.system.controller.base.person.info.PersonInfoRespVO;
-import com.citu.module.menduner.system.controller.base.person.info.PersonInfoSaveReqVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -76,9 +76,9 @@ public class PersonInfoController {
     @GetMapping("/page")
     @Operation(summary = "获得人才信息-人才档案分页")
     @PreAuthorize("@ss.hasPermission('menduner:system:person-info:query')")
-    public CommonResult<PageResult<PersonInfoRespVO>> getUserInfoPage(@Valid PersonInfoPageReqVO pageReqVO) {
-        PageResult<PersonInfoDO> pageResult = personInfoService.getUserInfoPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, PersonInfoRespVO.class));
+    public CommonResult<PageResult<UserPersonRespVO>> getUserInfoPage(@Valid UserPersonPageReqVO pageReqVO) {
+        PageResult<UserPersonRespVO> pageResult = personIntegrationService.page(pageReqVO);
+        return success(pageResult);
     }
 
     @GetMapping("/export-excel")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/user/UserPackageController.java

@@ -78,6 +78,14 @@ public class UserPackageController {
         return success(BeanUtils.toBean(pageResult, UserPackageRespVO.class));
     }
 
+    @GetMapping("/list")
+    @Operation(summary = "获得用户套餐列表")
+    @PreAuthorize("@ss.hasPermission('menduner:system:user-package:query')")
+    public CommonResult<List<UserPackageRespVO>> list() {
+        List<UserPackageDO> list = userPackageService.getList();
+        return success(BeanUtils.toBean(list, UserPackageRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出用户套餐 Excel")
     @PreAuthorize("@ss.hasPermission('menduner:system:user-package:export')")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/resume/AppPersonInfoSaveReqVO.java

@@ -17,6 +17,9 @@ public class AppPersonInfoSaveReqVO {
     @Schema(description = "真实姓名", example = "王五")
     private String name;
 
+    @Schema(description = "外文名称", example = "mike")
+    private String foreignName;
+
     @Schema(description = "用户性别")
     private String sex;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/person/info/PersonInfoPageReqVO.java

@@ -24,12 +24,12 @@ public class PersonInfoPageReqVO extends PageParam {
     @Schema(description = "真实姓名", example = "王五")
     private String name;
 
+    @Schema(description = "外文名称", example = "mike")
+    private String foreignName;
+
     @Schema(description = "用户性别")
     private String sex;
 
-    @Schema(description = "头像地址")
-    private String avatar;
-
     @Schema(description = "联系手机号")
     private String phone;
 
@@ -62,9 +62,6 @@ public class PersonInfoPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime firstWorkTime;
 
-    @Schema(description = "人才优势")
-    private String advantage;
-
     @Schema(description = "工作经验", example = "1")
     private String expType;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/person/info/PersonInfoRespVO.java

@@ -21,6 +21,9 @@ public class PersonInfoRespVO {
     @ExcelProperty("用户id")
     private Long userId;
 
+    @Schema(description = "外文名", example = "mike")
+    private String foreignName;
+
     @Schema(description = "真实姓名", example = "王五")
     @ExcelProperty("真实姓名")
     private String name;
@@ -93,4 +96,7 @@ public class PersonInfoRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("更新时间")
+    private LocalDateTime updateTime;
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/user/MdeUserRespVO.java

@@ -62,6 +62,9 @@ public class MdeUserRespVO {
     @ExcelProperty("vip过期时间")
     private LocalDateTime vipExpireDate;
 
+    @Schema(description = "邀请码,用户id")
+    private Long inviteCode;
+
     @Schema(description = "最后登录IP")
     @ExcelProperty("最后登录IP")
     private String loginIp;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/userperson/UserPersonPageReqVO.java

@@ -0,0 +1,26 @@
+package com.citu.module.menduner.system.controller.base.userperson;
+
+
+import com.citu.module.menduner.system.controller.base.person.info.PersonInfoPageReqVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
+@Schema(description = "用户人才信息 Response VO")
+@Data
+public class UserPersonPageReqVO extends PersonInfoPageReqVO {
+
+    @Schema(description = "帐号状态（0正常 1停用）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    private String status;
+
+    @Schema(description = "vip标识")
+    private String vipFlag;
+
+    @Schema(description = "vip过期时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDateTime[] vipExpireDate;
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/userperson/UserPersonRespVO.java

@@ -0,0 +1,25 @@
+package com.citu.module.menduner.system.controller.base.userperson;
+
+
+import com.citu.module.menduner.system.controller.base.person.info.PersonInfoRespVO;
+import com.citu.module.menduner.system.controller.base.user.MdeUserRespVO;
+import com.citu.module.menduner.system.controller.base.workexp.WorkExpRespVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "用户人才信息 Response VO")
+@Data
+public class UserPersonRespVO {
+
+    @Schema(description = "用户信息")
+    private MdeUserRespVO user;
+
+    @Schema(description = "人才信息")
+    private PersonInfoRespVO person;
+
+    @Schema(description = "最近一份工作经历")
+    private WorkExpRespVO work;
+
+    @Schema(description = "邀请用户,如果邀请方填写了简历就是名字，否则就是登录手机号")
+    private String inviteUserStr;
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/convert/WorkExpConvert.java

@@ -19,4 +19,6 @@ public interface WorkExpConvert {
     List<AppRecruitWorkExpRespVO> convertList2(List<WorkExpDO> list);
 
     List<WorkExpRespVO> convertList3(List<WorkExpDO> list);
+
+    WorkExpRespVO convert(WorkExpDO workExpDO);
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/person/PersonInfoMapper.java

@@ -52,7 +52,6 @@ public interface PersonInfoMapper extends BaseMapperX<PersonInfoDO> {
                 .orderByDesc(PersonInfoDO::getId));
     }
 
-
     /**
      * 根据企业id和查询条件获取企业人才库数据分页
      **/

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/user/MdeUserMapper.java

@@ -7,6 +7,9 @@ import com.citu.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.citu.module.menduner.common.dto.TimeRangeBaseReqVO;
 import com.citu.module.menduner.system.controller.base.CommonRespVO;
 import com.citu.module.menduner.system.controller.base.user.MdeUserPageReqVO;
+import com.citu.module.menduner.system.controller.base.userperson.UserPersonPageReqVO;
+import com.citu.module.menduner.system.controller.base.userperson.UserPersonRespVO;
+import com.citu.module.menduner.system.dal.dataobject.person.PersonInfoDO;
 import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
 import com.citu.module.menduner.system.util.RecruitAnalysisUtils;
 import org.apache.ibatis.annotations.Mapper;
@@ -37,6 +40,39 @@ public interface MdeUserMapper extends BaseMapperX<MdeUserDO> {
                 .orderByDesc(MdeUserDO::getId));
     }
 
+    /**
+     * 分页以用户为主查询人才简历信息和最近一份工作经验
+     **/
+    default PageResult<UserPersonRespVO> page(UserPersonPageReqVO reqVO) {
+        MPJLambdaWrapperX<MdeUserDO> query = new MPJLambdaWrapperX<>();
+        query.selectAssociation(MdeUserDO.class, UserPersonRespVO::getUser);
+        query.selectAssociation(PersonInfoDO.class, UserPersonRespVO::getPerson);
+        query.leftJoin(PersonInfoDO.class, on -> on.eq(PersonInfoDO::getUserId, MdeUserDO::getId));
+
+        query.likeRightIfExists(PersonInfoDO::getName, reqVO.getName());
+        query.likeRightIfExists(PersonInfoDO::getPhone, reqVO.getPhone())
+                .or().likeRightIfExists(MdeUserDO::getPhone, reqVO.getPhone());
+
+        query.eqIfExists(PersonInfoDO::getSex, reqVO.getSex())
+                .likeRightIfExists(PersonInfoDO::getEmail, reqVO.getEmail())
+                .likeRightIfExists(PersonInfoDO::getWxCode, reqVO.getWxCode())
+                .eqIfExists(PersonInfoDO::getMaritalStatus, reqVO.getMaritalStatus())
+                .eqIfExists(PersonInfoDO::getAreaId, reqVO.getAreaId())
+                .eqIfExists(PersonInfoDO::getJobType, reqVO.getJobType())
+                .eqIfExists(PersonInfoDO::getJobStatus, reqVO.getJobStatus())
+                .eqIfExists(PersonInfoDO::getEduType, reqVO.getEduType())
+                .eqIfExists(PersonInfoDO::getExpType, reqVO.getExpType());
+
+        query.eqIfExists(MdeUserDO::getVipFlag, reqVO.getVipFlag());
+        query.eqIfExists(MdeUserDO::getStatus, reqVO.getStatus());
+        query.likeRightIfExists(MdeUserDO::getId, reqVO.getUserId());
+        query.betweenIfPresent2(MdeUserDO::getVipExpireDate, reqVO.getVipExpireDate());
+        query.betweenIfPresent2(MdeUserDO::getCreateTime, reqVO.getCreateTime());
+
+        query.orderByDesc(PersonInfoDO::getUpdateTime);
+        return selectJoinPage(reqVO, UserPersonRespVO.class, query);
+    }
+
     default MdeUserDO selectByEmail(String email) {
         return selectOne(MdeUserDO::getEmail, email);
     }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/workexp/WorkExpMapper.java

@@ -53,4 +53,13 @@ public interface WorkExpMapper extends BaseMapperX<WorkExpDO> {
                 .eqIfPresent(WorkExpDO::getUserId, userId));
     }
 
+    /** 获取最近一次工作经历 **/
+    default WorkExpDO selectLastOne(Long userId) {
+        return selectOne(new LambdaQueryWrapperX<WorkExpDO>()
+                .eqIfPresent(WorkExpDO::getUserId, userId)
+                .orderByDesc(WorkExpDO::getStartTime)
+                .last("limit 1"));
+    }
+
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/mq/consumer/ESConsumer.java

@@ -29,6 +29,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.StopWatch;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -130,8 +131,14 @@ public class ESConsumer implements RocketMQListener<ESJobAdvertisedMergeSendMess
             log.error("找不到招聘职位信息 {} ", id);
             return;
         }
+        // 判断职位是否过期
+        if (checkJobExpireTime(job)) {
+            jobDel(job.getId());
+            return;
+        }
         if (JobStatusEnum.DISABLE.getStatus().equals(job.getStatus())) {
             jobDel(job.getId());
+            return;
         }
         if (JobStatusEnum.ENABLE.getStatus().equals(job.getStatus())) {
             EnterpriseDO enterpriseDO = enterpriseMapper.selectById(job.getEnterpriseId());
@@ -150,6 +157,10 @@ public class ESConsumer implements RocketMQListener<ESJobAdvertisedMergeSendMess
             log.error("找不到招聘职位信息 {} ", id);
             return;
         }
+        // 判断职位是否过期
+        if (checkJobExpireTime(job)) {
+            return;
+        }
         EnterpriseDO enterpriseDO = enterpriseMapper.selectById(job.getEnterpriseId());
         repository.save(build(job, enterpriseDO));
     }
@@ -163,6 +174,19 @@ public class ESConsumer implements RocketMQListener<ESJobAdvertisedMergeSendMess
         repository.deleteById(id);
     }
 
+    /**
+     * 判断是否过期
+     *
+     * @param job 职位信息
+     * @return true 过期 false 未过期
+     **/
+    private boolean checkJobExpireTime(JobAdvertisedDO job) {
+        if(null == job.getExpireTime()) {
+            return true;
+        }
+        return job.getExpireTime().isBefore(LocalDateTime.now());
+    }
+
     /**
      * 企业信息修改
      *

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/PersonIntegrationService.java

@@ -7,6 +7,8 @@ import com.citu.module.menduner.system.controller.base.person.PersonQueryReqVO;
 import com.citu.module.menduner.system.controller.base.person.PersonRecommendQueryReqVO;
 import com.citu.module.menduner.system.controller.base.person.info.PersonInfoPageReqVO;
 import com.citu.module.menduner.system.controller.base.person.info.PersonInfoRespVO;
+import com.citu.module.menduner.system.controller.base.userperson.UserPersonPageReqVO;
+import com.citu.module.menduner.system.controller.base.userperson.UserPersonRespVO;
 
 /**
  * 人才信息相关的整合层
@@ -15,6 +17,15 @@ import com.citu.module.menduner.system.controller.base.person.info.PersonInfoRes
  **/
 public interface PersonIntegrationService {
 
+    /**
+     * 系统后台-人才用户分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 人才用户分页
+     */
+    PageResult<UserPersonRespVO> page(UserPersonPageReqVO pageReqVO);
+
+
     /**
      * 根据id获取人才在线简历详情
      *
@@ -47,6 +58,7 @@ public interface PersonIntegrationService {
 
     /**
      * 人才信息-根据发布职位推荐人才
+     *
      * @param reqVO 发布职位id
      * @return PageResult<PersonInfoRespVO>
      **/

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/PersonIntegrationServiceImpl.java

@@ -15,6 +15,8 @@ import com.citu.module.menduner.system.controller.base.person.PersonRecommendQue
 import com.citu.module.menduner.system.controller.base.person.info.PersonDetailRespVO;
 import com.citu.module.menduner.system.controller.base.person.info.PersonInfoPageReqVO;
 import com.citu.module.menduner.system.controller.base.person.info.PersonInfoRespVO;
+import com.citu.module.menduner.system.controller.base.userperson.UserPersonPageReqVO;
+import com.citu.module.menduner.system.controller.base.userperson.UserPersonRespVO;
 import com.citu.module.menduner.system.convert.*;
 import com.citu.module.menduner.system.dal.dataobject.eduexp.EduExpDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseTalentPoolDO;
@@ -23,6 +25,7 @@ import com.citu.module.menduner.system.dal.dataobject.person.PersonInfoDO;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonSkillDO;
 import com.citu.module.menduner.system.dal.dataobject.projectexp.ProjectExpDO;
 import com.citu.module.menduner.system.dal.dataobject.trainexp.TrainExpDO;
+import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
 import com.citu.module.menduner.system.dal.dataobject.workexp.WorkExpDO;
 import com.citu.module.menduner.system.dal.mysql.eduexp.EduExpMapper;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseTalentPoolMapper;
@@ -31,6 +34,7 @@ import com.citu.module.menduner.system.dal.mysql.person.PersonInfoMapper;
 import com.citu.module.menduner.system.dal.mysql.person.PersonSkillMapper;
 import com.citu.module.menduner.system.dal.mysql.projectexp.ProjectExpMapper;
 import com.citu.module.menduner.system.dal.mysql.trainexp.TrainExpMapper;
+import com.citu.module.menduner.system.dal.mysql.user.MdeUserMapper;
 import com.citu.module.menduner.system.dal.mysql.workexp.WorkExpMapper;
 import com.citu.module.menduner.system.enums.sync.SyncConstants;
 import com.citu.module.menduner.system.mq.producer.GraphProducer;
@@ -53,6 +57,9 @@ import static com.citu.module.menduner.system.enums.DictTypeConstants.*;
 @Validated
 public class PersonIntegrationServiceImpl implements PersonIntegrationService {
 
+    @Resource
+    private MdeUserMapper userMapper;
+
     @Resource
     private PersonInfoMapper personInfoMapper;
 
@@ -89,6 +96,32 @@ public class PersonIntegrationServiceImpl implements PersonIntegrationService {
     @Resource
     private RedisUtils redisUtils;
 
+    @Override
+    public PageResult<UserPersonRespVO> page(UserPersonPageReqVO pageReqVO) {
+        PageResult<UserPersonRespVO> result = userMapper.page(pageReqVO);
+        result.getList().forEach(item -> {
+            WorkExpDO lastWorkExp = workExpMapper.selectLastOne(item.getUser().getId());
+            if (null != lastWorkExp) {
+                item.setWork(WorkExpConvert.INSTANCE.convert(lastWorkExp));
+            }
+            if (null != item.getUser().getInviteCode()) {
+                // 查询邀请人是否填写个人简历，填写了就显示名称，没有填写则显示登录手机号
+                Long userId = item.getUser().getInviteCode();
+                PersonInfoDO person = personInfoMapper.getByUserId(userId);
+                if (null == person) {
+                    MdeUserDO user = userMapper.selectOne(MdeUserDO::getId, userId);
+                    if (null != user) {
+                        item.setInviteUserStr(user.getPhone());
+                    }
+                } else {
+                    item.setInviteUserStr(person.getName());
+                }
+
+            }
+        });
+        return result;
+    }
+
 
     @Override
     public AppRecruitPersonDetailRespVO detail(Long userId) {

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/info/PersonInfoServiceImpl.java

@@ -18,7 +18,6 @@ import com.citu.module.menduner.system.controller.base.person.info.PersonInfoPag
 import com.citu.module.menduner.system.controller.base.person.info.PersonInfoSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonInfoDO;
 import com.citu.module.menduner.system.dal.mysql.person.PersonInfoMapper;
-import com.citu.module.menduner.system.enums.eduexp.EducationTypeEnum;
 import com.citu.module.menduner.system.enums.sync.SyncConstants;
 import com.citu.module.menduner.system.mq.producer.GraphProducer;
 import org.springframework.stereotype.Service;
@@ -26,7 +25,6 @@ import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-
 import java.time.LocalDateTime;
 import java.util.Comparator;
 import java.util.List;

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

@@ -99,7 +99,7 @@ public class ESQueryBuildUtils {
             boolQuery.filter(QueryBuilders.termQuery("hire", reqVO.getHire()));
         }
 
-        // 获取当前时间并格式化为字符串
+//        // 获取当前时间并格式化为字符串
 //        String formattedNow = LocalDateTime.now()
 //                .format(DateTimeFormatter.ofPattern(FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
 //