1、增加统计分析维度

2、增加用户人才信息查询条件
3、增加优化后台-人才投递简历

menduner/menduner-common/src/main/java/com/citu/module/menduner/common/dto/TimeRange.java

@@ -19,6 +19,8 @@ public interface TimeRange {
     String TYPE_MONTH = "4";
     /** 最近一年 **/
     String TYPE_YEAR = "5";
+    /** 最近3个月 **/
+    String TYPE_THREE_MONTH = "6";
     /** 自定义 **/
     String TYPE_CUSTOM = "99";
 }

menduner/menduner-common/src/main/java/com/citu/module/menduner/common/util/TimeUtils.java

@@ -68,6 +68,11 @@ public class TimeUtils {
                 dateTimeRange[0] = now.minusDays(30);
                 dateTimeRange[1] = now;
                 break;
+            case TimeRange.TYPE_THREE_MONTH:
+                // 最近三个月
+                dateTimeRange[0] = now.minusMonths(3);
+                dateTimeRange[1] = now;
+                break;
             case TimeRange.TYPE_YEAR:
                 // 最近一年
                 dateTimeRange[0] = now.minusMonths(12);

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/job/JobCvRelController.java

@@ -6,11 +6,13 @@ 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.job.cv.JobCvRelDetailRespVO;
 import com.citu.module.menduner.system.controller.base.job.cv.JobCvRelPageReqVO;
 import com.citu.module.menduner.system.controller.base.job.cv.JobCvRelRespVO;
 import com.citu.module.menduner.system.controller.base.job.cv.JobCvRelSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobCvRelDO;
 import com.citu.module.menduner.system.service.job.JobCvRelService;
+import com.citu.module.menduner.system.service.job.JobIntegrationService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -36,6 +38,9 @@ public class JobCvRelController {
     @Resource
     private JobCvRelService jobCvRelService;
 
+    @Resource
+    private JobIntegrationService jobIntegrationService;
+
     @PostMapping("/create")
     @Operation(summary = "创建招聘职位简历投递")
     @PreAuthorize("@ss.hasPermission('menduner:system:job-cv-rel:create')")
@@ -72,11 +77,12 @@ public class JobCvRelController {
     @GetMapping("/page")
     @Operation(summary = "获得招聘职位简历投递分页")
     @PreAuthorize("@ss.hasPermission('menduner:system:job-cv-rel:query')")
-    public CommonResult<PageResult<JobCvRelRespVO>> getJobCvRelPage(@Valid JobCvRelPageReqVO pageReqVO) {
-        PageResult<JobCvRelDO> pageResult = jobCvRelService.getJobCvRelPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, JobCvRelRespVO.class));
+    public CommonResult<PageResult<JobCvRelDetailRespVO>> getJobCvRelPage(@Valid JobCvRelPageReqVO pageReqVO) {
+        PageResult<JobCvRelDetailRespVO> result = jobIntegrationService.getJobCvPage(pageReqVO, pageReqVO.getUserId());
+        return success(result);
     }
 
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出招聘职位简历投递 Excel")
     @PreAuthorize("@ss.hasPermission('menduner:system:job-cv-rel:export')")

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

@@ -95,7 +95,7 @@ public class MdeUserController {
 
     @PutMapping("/update-password")
     @Operation(summary = "重置用户密码")
-    @PreAuthorize("@ss.hasPermission('system:user:update-password')")
+    @PreAuthorize("@ss.hasPermission('menduner:system:mde-user:update-password')")
     public CommonResult<Boolean> updateUserPassword(@Valid @RequestBody MdeUserUpdatePasswordReqVO reqVO) {
         mdeUserService.updateUserPassword(reqVO.getId(), reqVO.getPassword());
         return success(true);
@@ -103,7 +103,7 @@ public class MdeUserController {
 
     @PutMapping("/update-status")
     @Operation(summary = "修改用户状态")
-    @PreAuthorize("@ss.hasPermission('system:user:update')")
+    @PreAuthorize("@ss.hasPermission('menduner:system:mde-user::update')")
     public CommonResult<Boolean> updateUserStatus(@Valid @RequestBody MdeUserUpdateStatusReqVO reqVO) {
         mdeUserService.updateUserStatus(reqVO.getId(), reqVO.getStatus());
         return success(true);

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/AppJobCvRelController.java

@@ -6,6 +6,7 @@ import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.idempotent.core.annotation.Idempotent;
 import com.citu.framework.idempotent.core.keyresolver.impl.UserIdempotentKeyResolver;
 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.job.hire.AppHireJobCvRelQueryReqVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.job.hire.AppHireJobCvRelReqVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.job.hire.AppHireJobCvRelRespVO;
@@ -13,6 +14,7 @@ import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppJobAdver
 import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppJobCvLookRespVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppJobCvRelReqVO;
 import com.citu.module.menduner.system.controller.base.CommonRespVO;
+import com.citu.module.menduner.system.convert.JobAdvertisedConvert;
 import com.citu.module.menduner.system.service.job.JobCvRelService;
 import com.citu.module.menduner.system.service.job.JobIntegrationService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -44,7 +46,11 @@ public class AppJobCvRelController {
     @PreAuthenticated
     @Operation(summary = "获取投递的职位分页")
     public CommonResult<PageResult<AppJobAdvertisedRespVO>> getJobCvPage(@Valid PageParam page) {
-        return success(jobIntegrationService.getJobCvPage(page));
+        // 获取已投递的职位
+        Long userId = LoginUserContext.getUserId();
+        PageResult<AppJobAdvertisedRespVO> result =
+                JobAdvertisedConvert.INSTANCE.convertPage(jobIntegrationService.getJobCvPage(page,userId));
+        return success(result);
     }
 
     @GetMapping("/look/page")
@@ -98,8 +104,4 @@ public class AppJobCvRelController {
     public CommonResult<Boolean> checkSend(@RequestParam("jobId") Long jobId) {
         return success(jobCvRelService.checkSend(jobId));
     }
-
-
-
-
 }

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

@@ -2,6 +2,7 @@ package com.citu.module.menduner.system.controller.app.jobhunt.job.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.job.JobAdvertisedSimpleRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -10,7 +11,7 @@ import lombok.Data;
 public class AppJobAdvertisedRespVO {
 
     @Schema(description = "招聘职位信息")
-    private AppJobAdvertisedSimpleRespVO job;
+    private JobAdvertisedSimpleRespVO job;
 
     @Schema(description = "招聘企业信息")
     private EnterpriseBaseSimpleRespVO enterprise;

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

@@ -15,6 +15,7 @@ import com.citu.module.menduner.system.controller.app.jobhunt.person.vo.AppInvit
 import com.citu.module.menduner.system.controller.app.jobhunt.person.vo.AppPersonInfoRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseBaseSimpleRespVO;
 import com.citu.module.menduner.system.controller.base.person.block.PersonEnterpriseBlockSaveReqVO;
+import com.citu.module.menduner.system.convert.JobAdvertisedConvert;
 import com.citu.module.menduner.system.convert.PersonConvert;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonInfoDO;
 import com.citu.module.menduner.system.service.job.JobIntegrationService;
@@ -139,7 +140,9 @@ public class AppPersonController {
     @Operation(summary = "获取收藏的招聘职位分页")
     public CommonResult<PageResult<AppJobAdvertisedRespVO>> getJobFavoritePage
             (@Valid PageParam reqVO) {
-        return success(jobIntegrationService.getJobFavoritePage(reqVO));
+        PageResult<AppJobAdvertisedRespVO> result =
+                JobAdvertisedConvert.INSTANCE.convertPage2(jobIntegrationService.getJobFavoritePage(reqVO,LoginUserContext.getUserId()));
+        return success(result);
     }
 
     @PreAuthenticated

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/job/JobAdvertisedDetailRespVO.java

@@ -0,0 +1,20 @@
+package com.citu.module.menduner.system.controller.base.job;
+
+import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserContactRespVO;
+import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseBaseSimpleRespVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "menduner - 职位详情 Response VO")
+@Data
+public class JobAdvertisedDetailRespVO {
+
+    @Schema(description = "招聘职位信息")
+    private JobAdvertisedSimpleRespVO job;
+
+    @Schema(description = "招聘企业信息")
+    private EnterpriseBaseSimpleRespVO enterprise;
+
+    @Schema(description = "招聘联系人信息")
+    private EnterpriseUserContactRespVO contact;
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/job/cv/JobCvRelDetailRespVO.java

@@ -0,0 +1,14 @@
+package com.citu.module.menduner.system.controller.base.job.cv;
+
+import com.citu.module.menduner.system.controller.base.job.JobAdvertisedDetailRespVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "menduner - 职位详情 Response VO")
+@Data
+public class JobCvRelDetailRespVO extends JobAdvertisedDetailRespVO {
+
+    @Schema(description = "投递的信息")
+    private JobCvRelRespVO cvRel;
+
+}

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

@@ -8,7 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 
-import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "用户人才信息 Response VO")
 @Data
@@ -21,6 +21,6 @@ public class UserPersonPageReqVO extends PersonInfoPageReqVO {
     private String vipFlag;
 
     @Schema(description = "vip过期时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] vipExpireDate;
 }

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

@@ -1,12 +1,16 @@
 package com.citu.module.menduner.system.convert;
 
+import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppJobAdvertisedDetailRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppJobAdvertisedRespVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppJobAdvertisedSimpleRespVO;
 import com.citu.module.menduner.system.controller.app.recruit.job.vo.*;
 import com.citu.module.menduner.system.controller.base.analysis.RecruitJobAnalysisRespVO;
 import com.citu.module.menduner.system.controller.base.analysis.excel.RecruitJobAnalysisExcelRespVO;
+import com.citu.module.menduner.system.controller.base.job.JobAdvertisedDetailRespVO;
 import com.citu.module.menduner.system.controller.base.job.JobAdvertisedImportExcelVO;
 import com.citu.module.menduner.system.controller.base.job.JobAdvertisedRespVO;
+import com.citu.module.menduner.system.controller.base.job.cv.JobCvRelDetailRespVO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedExtendDO;
 import com.citu.module.menduner.system.dal.es.job.ESJobAdvertisedMergeDO;
@@ -60,4 +64,8 @@ public interface JobAdvertisedConvert {
 
     JobAdvertisedExtendDO convert10(AppRecruitJobExtendSaveReqVO bean);
 
+    PageResult<AppJobAdvertisedRespVO> convertPage(PageResult<JobCvRelDetailRespVO> result);
+
+    PageResult<AppJobAdvertisedRespVO> convertPage2(PageResult<JobAdvertisedDetailRespVO> result);
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/job/JobAdvertisedMapper.java

@@ -17,8 +17,10 @@ import com.citu.module.menduner.system.controller.app.recruit.job.vo.AppRecruitJ
 import com.citu.module.menduner.system.controller.app.recruit.job.vo.AppRecruitJobSimpleRespVO;
 import com.citu.module.menduner.system.controller.base.analysis.RecruitAnalysisPageReqVO;
 import com.citu.module.menduner.system.controller.base.analysis.RecruitJobAnalysisRespVO;
+import com.citu.module.menduner.system.controller.base.job.JobAdvertisedDetailRespVO;
 import com.citu.module.menduner.system.controller.base.job.JobAdvertisedPageReqVO;
 import com.citu.module.menduner.system.controller.base.job.JobAdvertisedReqVO;
+import com.citu.module.menduner.system.controller.base.job.cv.JobCvRelDetailRespVO;
 import com.citu.module.menduner.system.dal.dataobject.area.AreaDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
@@ -210,33 +212,34 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
     /**
      * 根据用户id 查询收藏的职位信息
      **/
-    default PageResult<AppJobAdvertisedRespVO> selectFavoriteJobPage(PageParam pageParam, Long userId) {
+    default PageResult<JobAdvertisedDetailRespVO> selectFavoriteJobPage(PageParam pageParam, Long userId) {
         MPJLambdaWrapperX<JobAdvertisedDO> query = new MPJLambdaWrapperX<>();
-        query.selectAssociation(JobAdvertisedDO.class, AppJobAdvertisedRespVO::getJob);
-        query.selectAssociation(EnterpriseDO.class, AppJobAdvertisedRespVO::getEnterprise);
+        query.selectAssociation(JobAdvertisedDO.class, JobAdvertisedDetailRespVO::getJob);
+        query.selectAssociation(EnterpriseDO.class, JobAdvertisedDetailRespVO::getEnterprise);
 
         query.innerJoin(PersonJobFavoriteDO.class, PersonJobFavoriteDO::getJobId, JobAdvertisedDO::getId);
         query.innerJoin(EnterpriseDO.class, EnterpriseDO::getId, JobAdvertisedDO::getEnterpriseId);
         query.eq(PersonJobFavoriteDO::getUserId, userId);
 
         query.orderByDesc(PersonJobFavoriteDO::getUpdateTime);
-        return selectJoinPage(pageParam, AppJobAdvertisedRespVO.class, query);
+        return selectJoinPage(pageParam, JobAdvertisedDetailRespVO.class, query);
     }
 
     /**
      * 根据用户id 查询投递的职位信息
      **/
-    default PageResult<AppJobAdvertisedRespVO> selectCvRelJobPage(PageParam pageParam, Long userId) {
+    default PageResult<JobCvRelDetailRespVO> selectCvRelJobPage(PageParam pageParam, Long userId) {
         MPJLambdaWrapperX<JobAdvertisedDO> query = new MPJLambdaWrapperX<>();
-        query.selectAssociation(JobAdvertisedDO.class, AppJobAdvertisedRespVO::getJob);
-        query.selectAssociation(EnterpriseDO.class, AppJobAdvertisedRespVO::getEnterprise);
+        query.selectAssociation(JobAdvertisedDO.class, JobCvRelDetailRespVO::getJob);
+        query.selectAssociation(EnterpriseDO.class, JobCvRelDetailRespVO::getEnterprise);
+        query.selectAssociation(JobCvRelDO.class, JobCvRelDetailRespVO::getCvRel);
 
         query.innerJoin(JobCvRelDO.class, JobCvRelDO::getJobId, JobAdvertisedDO::getId);
         query.innerJoin(EnterpriseDO.class, EnterpriseDO::getId, JobAdvertisedDO::getEnterpriseId);
         query.eq(JobCvRelDO::getUserId, userId);
 
         query.orderByDesc(JobAdvertisedDO::getUpdateTime);
-        return selectJoinPage(pageParam, AppJobAdvertisedRespVO.class, query);
+        return selectJoinPage(pageParam, JobCvRelDetailRespVO.class, query);
     }
 
 

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

@@ -49,7 +49,8 @@ public interface MdeUserMapper extends BaseMapperX<MdeUserDO> {
         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::getName, reqVO.getName())
+                .likeRightIfExists(PersonInfoDO::getForeignName, reqVO.getForeignName());
         query.likeRightIfExists(PersonInfoDO::getPhone, reqVO.getPhone())
                 .or().likeRightIfExists(MdeUserDO::getPhone, reqVO.getPhone());
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobIntegrationService.java

@@ -17,7 +17,9 @@ import com.citu.module.menduner.system.controller.app.recruit.unfit.AppRecruitUn
 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.enterprise.vo.EnterpriseBaseSimpleRespVO;
+import com.citu.module.menduner.system.controller.base.job.JobAdvertisedDetailRespVO;
 import com.citu.module.menduner.system.controller.base.job.JobAdvertisedImportExcelVO;
+import com.citu.module.menduner.system.controller.base.job.cv.JobCvRelDetailRespVO;
 
 import java.util.List;
 
@@ -30,21 +32,20 @@ import java.util.List;
  **/
 public interface JobIntegrationService {
 
-    // ========== 求职端 ==========
 
     /**
      * 获取已投递的招聘职位信息分页
      *
      * @param page 分页
      */
-    PageResult<AppJobAdvertisedRespVO> getJobCvPage(PageParam page);
+    PageResult<JobCvRelDetailRespVO> getJobCvPage(PageParam page, Long userId);
 
     /**
      * 获取收藏的招聘职位分页
      *
      * @param page 分页
      */
-    PageResult<AppJobAdvertisedRespVO> getJobFavoritePage(PageParam page);
+    PageResult<JobAdvertisedDetailRespVO> getJobFavoritePage(PageParam page,Long userId);
 
     /**
      * 获取关注的企业分页
@@ -53,6 +54,7 @@ public interface JobIntegrationService {
      */
     PageResult<EnterpriseBaseSimpleRespVO> getEnterpriseSubscribePage(PageParam page);
 
+    // ========== 求职端 ==========
     /**
      * 根据条件搜索职位
      *

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobIntegrationServiceImpl.java

@@ -20,7 +20,9 @@ import com.citu.module.menduner.system.controller.base.CommonRespVO;
 import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserContactRespVO;
 import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserSummaryRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseBaseSimpleRespVO;
+import com.citu.module.menduner.system.controller.base.job.JobAdvertisedDetailRespVO;
 import com.citu.module.menduner.system.controller.base.job.JobAdvertisedImportExcelVO;
+import com.citu.module.menduner.system.controller.base.job.cv.JobCvRelDetailRespVO;
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.convert.JobAdvertisedConvert;
 import com.citu.module.menduner.system.dal.dataobject.area.AreaDO;
@@ -61,9 +63,6 @@ import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_JOB_ADVERTISED_BALANCE_UPDATE;
-
 @Slf4j
 @Service
 @Validated
@@ -108,11 +107,10 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
     private RedisUtils redisUtils;
 
 
-    /**
-     * 包装职位发布联系人
-     **/
-    public PageResult<AppJobAdvertisedRespVO> packContact(PageResult<AppJobAdvertisedRespVO> result) {
-        for (AppJobAdvertisedRespVO respVO : result.getList()) {
+    @Override
+    public PageResult<JobCvRelDetailRespVO> getJobCvPage(PageParam page, Long userId) {
+        PageResult<JobCvRelDetailRespVO> result = jobAdvertisedMapper.selectCvRelJobPage(page, userId);
+        for (JobCvRelDetailRespVO respVO : result.getList()) {
             // 获取职位发布人
             EnterpriseUserContactRespVO contactRespVO = userBindService
                     .getContact(respVO.getEnterprise().getId(), respVO.getJob().getUserId());
@@ -123,18 +121,16 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
     }
 
     @Override
-    public PageResult<AppJobAdvertisedRespVO> getJobCvPage(PageParam page) {
-        // 获取已投递的职位
-        Long userId = LoginUserContext.getUserId();
-        PageResult<AppJobAdvertisedRespVO> result = jobAdvertisedMapper.selectCvRelJobPage(page, userId);
-        return packContact(result);
-    }
-
-    @Override
-    public PageResult<AppJobAdvertisedRespVO> getJobFavoritePage(PageParam page) {
-        Long userId = LoginUserContext.getUserId();
-        PageResult<AppJobAdvertisedRespVO> result = jobAdvertisedMapper.selectFavoriteJobPage(page, userId);
-        return packContact(result);
+    public PageResult<JobAdvertisedDetailRespVO> getJobFavoritePage(PageParam page, Long userId) {
+        PageResult<JobAdvertisedDetailRespVO> result = jobAdvertisedMapper.selectFavoriteJobPage(page, userId);
+        for (JobAdvertisedDetailRespVO respVO : result.getList()) {
+            // 获取职位发布人
+            EnterpriseUserContactRespVO contactRespVO = userBindService
+                    .getContact(respVO.getEnterprise().getId(), respVO.getJob().getUserId());
+            // 设置联系人
+            respVO.setContact(contactRespVO);
+        }
+        return result;
     }
 
     @Override
@@ -323,9 +319,9 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
             }
             // 如果发布职位的job.createTime超过了24小时则不可编辑,respVO.setEdit(false);
             if (JobStatusEnum.ENABLE.getStatus().equals(job.getStatus())
-                    &&ChronoUnit.HOURS.between(job.getCreateTime(), LocalDateTime.now()) > 24) {
+                    && ChronoUnit.HOURS.between(job.getCreateTime(), LocalDateTime.now()) > 24) {
                 respVO.setEdit(false);
-            }else {
+            } else {
                 respVO.setEdit(true);
             }
 

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

@@ -64,6 +64,7 @@ public class RecruitAnalysisUtils {
             case TYPE_LAST_MONTH:
             case TYPE_LAST_QUARTER:
             case TYPE_MONTH:
+            case TYPE_THREE_MONTH:
             case TYPE_CUSTOM:
                 wrapper.selectFunc("DATE_FORMAT(%s, '%%m-%%d')", arg -> arg.accept(column), "`key`");
                 wrapper.groupBy("DATE_FORMAT(create_time, '%Y-%m-%d')");