Prechádzať zdrojové kódy

1、解决已知bug
2、规范控制器地址

rayson 11 mesiacov pred
rodič
commit
888c57315f

+ 13 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/AppEnterpriseController.java

@@ -2,12 +2,16 @@ package com.citu.module.menduner.system.controller.app.enterprise;
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.security.core.annotations.PreAuthenticated;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.auth.AppEnterpriseAuthRespVO;
+import com.citu.module.menduner.system.controller.appadmin.enterprise.auth.AppAdminEnterpriseAuthRespVO;
 import com.citu.module.menduner.system.controller.base.CommonRespVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseClickReqVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseDetailRespVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseSearchPageReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseBaseSimpleRespVO;
 import com.citu.module.menduner.system.service.enterprise.EnterpriseService;
+import com.citu.module.menduner.system.service.enterprise.auth.EnterpriseAuthService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
@@ -30,6 +34,9 @@ public class AppEnterpriseController {
     @Resource
     private EnterpriseService enterpriseService;
 
+    @Resource
+    private EnterpriseAuthService enterpriseAuthService;
+
     @PostMapping("/click")
     @Operation(summary = "点击访问企业埋点")
     public CommonResult<Boolean> click(@RequestBody @Valid AppEnterpriseClickReqVO reqVO) {
@@ -44,6 +51,12 @@ public class AppEnterpriseController {
         return success(enterpriseService.getEnterpriseDetail(id));
     }
 
+    @GetMapping("/get/auth")
+    @Operation(summary = "获取企业实名认证")
+    public CommonResult<AppEnterpriseAuthRespVO> getAuth(@RequestParam("enterpriseId") Long enterpriseId) {
+        return success(enterpriseAuthService.getAuth(enterpriseId));
+    }
+
     @GetMapping("/search")
     @Operation(summary = "搜索企业")
     public CommonResult<PageResult<EnterpriseBaseSimpleRespVO>> search(@Valid AppEnterpriseSearchPageReqVO reqVO) {

+ 16 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/auth/AppEnterpriseAuthRespVO.java

@@ -0,0 +1,16 @@
+package com.citu.module.menduner.system.controller.app.enterprise.vo.auth;
+
+import com.citu.module.menduner.system.controller.base.enterprise.auth.EnterpriseAuthRespVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "menduner - 企业实名制 Response VO")
+@Data
+public class AppEnterpriseAuthRespVO extends EnterpriseAuthRespVO {
+
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+}

+ 3 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/convert/EnterpriseConvert.java

@@ -3,6 +3,7 @@ package com.citu.module.menduner.system.convert;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.*;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.apply.AppEnterpriseUserApplyReqVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.apply.AppEnterpriseUserApplyRespVO;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.auth.AppEnterpriseAuthRespVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.register.AppEnterpriseRegisterReqVO;
 import com.citu.module.menduner.system.controller.app.enterprise.vo.register.AppEnterpriseRegisterRespVO;
 import com.citu.module.menduner.system.controller.appadmin.enterprise.auth.AppAdminEnterpriseAuthRespVO;
@@ -64,4 +65,6 @@ public interface EnterpriseConvert {
     List<AppAdminEnterpriseTreeRespVO> convertList3(List<EnterpriseDO> list);
 
     AppAdminEnterpriseAuthRespVO convert18(EnterpriseAuthDO bean);
+
+    AppEnterpriseAuthRespVO convert19(EnterpriseAuthDO bean);
 }

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

@@ -180,17 +180,20 @@ public interface InterviewInviteMapper extends BaseMapperX<InterviewInviteDO> {
         return selectJoinList(InterviewInviteDO.class, query);
     }
 
-    default List<CommonRespVO> getRecommendCount(List<Long> jobIdList) {
+    default List<CommonRespVO> getRecommendCount(Long userId) {
         MPJLambdaWrapperX<InterviewInviteDO> wrapper = new MPJLambdaWrapperX<>();
         wrapper.
-                selectAs(InterviewInviteDO::getConversationStatus, "`key`")
-                .selectCount(InterviewInviteDO::getId, CommonRespVO::getValue)
-                .innerJoin(JobCvRelDO.class, JobCvRelDO::getJobId, InterviewInviteDO::getJobId)
-                .eq(JobCvRelDO::getType, "1")
-                .in(JobCvRelDO::getJobId, jobIdList)
-                .in(InterviewInviteDO::getConversationStatus,
-                        ConversationStatusEnum.ENTRY.getStatus(), ConversationStatusEnum.SETTLEMENT.getStatus())
-                .groupBy(InterviewInviteDO::getConversationStatus);
+                selectAs(InterviewInviteDO::getConversationStatus, "`key`");
+        wrapper.selectCount(InterviewInviteDO::getId, CommonRespVO::getValue);
+        wrapper.innerJoin(JobCvRelDO.class, on -> on
+                        .eq(JobCvRelDO::getJobId, InterviewInviteDO::getJobId)
+                        .eq(JobCvRelDO::getRecommendUserId, InterviewInviteDO::getUserId)
+        );
+        wrapper.eq(JobCvRelDO::getType, "1");
+        wrapper.eq(JobCvRelDO::getRecommendUserId,userId);
+        wrapper.in(InterviewInviteDO::getConversationStatus,
+                ConversationStatusEnum.ENTRY.getStatus(), ConversationStatusEnum.SETTLEMENT.getStatus());
+        wrapper.groupBy(InterviewInviteDO::getConversationStatus);
 
         wrapper.orderByDesc("`key`");
         return selectJoinList(CommonRespVO.class, wrapper);

+ 13 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/auth/EnterpriseAuthService.java

@@ -2,12 +2,12 @@ package com.citu.module.menduner.system.service.enterprise.auth;
 
 
 import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.menduner.system.controller.app.enterprise.vo.auth.AppEnterpriseAuthRespVO;
 import com.citu.module.menduner.system.controller.appadmin.enterprise.auth.AppAdminEnterpriseAuthRespVO;
 import com.citu.module.menduner.system.controller.appadmin.enterprise.auth.AppAdminEnterpriseAuthSaveReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.auth.EnterpriseAuthAuditReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.auth.EnterpriseAuthPageReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.auth.EnterpriseAuthSaveReqVO;
-import com.citu.module.menduner.system.controller.base.enterprise.apply.EnterpriseUserApplyAuditReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseAuthDO;
 
 import javax.validation.Valid;
@@ -73,6 +73,17 @@ public interface EnterpriseAuthService {
      **/
     void reject(EnterpriseAuthAuditReqVO reqVO);
 
+    // ========== 求职端 ==========
+    /**
+     * 获取企业实名认证
+     *
+     * @param enterpriseId 企业id
+     * @return 企业实名制信息
+     */
+    AppEnterpriseAuthRespVO getAuth(Long enterpriseId);
+
+    // ========== 招聘端 ==========
+
     /**
      * 获取企业实名认证
      *
@@ -87,4 +98,5 @@ public interface EnterpriseAuthService {
      */
     void save(AppAdminEnterpriseAuthSaveReqVO reqVO);
 
+
 }

+ 7 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/auth/EnterpriseAuthServiceImpl.java

@@ -6,6 +6,7 @@ import com.citu.framework.common.pojo.PageResult;
 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.enterprise.vo.auth.AppEnterpriseAuthRespVO;
 import com.citu.module.menduner.system.controller.appadmin.enterprise.auth.AppAdminEnterpriseAuthRespVO;
 import com.citu.module.menduner.system.controller.appadmin.enterprise.auth.AppAdminEnterpriseAuthSaveReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.auth.EnterpriseAuthAuditReqVO;
@@ -15,7 +16,6 @@ import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseAuthDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseAuthMapper;
 import com.citu.module.menduner.system.enums.enterprise.EnterpriseAuthStatusEnum;
-import com.citu.module.menduner.system.enums.enterprise.EnterpriseUserApplyAuditStatusEnum;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -99,6 +99,12 @@ public class EnterpriseAuthServiceImpl implements EnterpriseAuthService {
         mapper.updateById(enterpriseAuth);
     }
 
+    @Override
+    public AppEnterpriseAuthRespVO getAuth(Long enterpriseId) {
+        return EnterpriseConvert.INSTANCE.convert19(mapper.
+                selectByEnterprise(enterpriseId));
+    }
+
     @Override
     public AppAdminEnterpriseAuthRespVO get() {
         return EnterpriseConvert.INSTANCE.convert18(mapper.

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

@@ -93,10 +93,9 @@ public interface InterviewInviteService {
     /**
      * 获取推荐职位面试会话状态数量
      *
-     * @param jobIdList 职位id列表
      * @return 推荐职位投递状态数量
      */
-    List<CommonRespVO> getRecommendCount(List<Long> jobIdList);
+    List<CommonRespVO> getRecommendCount(Long userId);
 
     // ========== 招聘端 ==========
 

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

@@ -175,8 +175,8 @@ public class InterviewInviteServiceImpl implements InterviewInviteService {
     }
 
     @Override
-    public List<CommonRespVO> getRecommendCount(List<Long> jobIdList) {
-        return mapper.getRecommendCount(jobIdList);
+    public List<CommonRespVO> getRecommendCount(Long userId) {
+        return mapper.getRecommendCount(userId);
     }
 
     @Override

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

@@ -198,15 +198,16 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
 
     @Override
     public List<CommonRespVO> getRecommendCount() {
+        Long userId = LoginUserContext.getUserId();
         List<JobCvRelDO> cvList = jobCvRelMapper
-                .selectByRecommendUserId(LoginUserContext.getUserId());
-        if(CollUtil.isEmpty(cvList)) {
+                .selectByRecommendUserId(userId);
+        if (CollUtil.isEmpty(cvList)) {
             return null;
         }
 
         // 分组
 
-        List<CommonRespVO> cvStatusList = new ArrayList(1){{
+        List<CommonRespVO> cvStatusList = new ArrayList(1) {{
             CommonRespVO respVO = new CommonRespVO();
             // 已报名
             respVO.setKey("0");
@@ -214,11 +215,8 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
             add(respVO);
         }};
 
-
-        List<Long> jobIdList = cvList.stream().map(JobCvRelDO::getJobId).collect(Collectors.toList());
-
         List<CommonRespVO> interviewConversationStatusList = interviewInviteService
-                .getRecommendCount(jobIdList);
+                .getRecommendCount(userId);
 
         // 合并
         cvStatusList.addAll(interviewConversationStatusList);