1、修改企业用户接口参数

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/person/AppAdminPersonCvController.java

@@ -64,7 +64,7 @@ public class AppAdminPersonCvController {
     @PostMapping("/entry")
     @Operation(summary = "入职")
     public CommonResult<Boolean> entry(@RequestParam("ids") String ids) {
-        return success(jobCvRelService.eliminate(StrUtils.splitToLong(ids)));
+        return success(jobCvRelService.entry(StrUtils.splitToLong(ids)));
     }
 
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/person/vo/AppAdminPersonSimpleRespVO.java

@@ -42,10 +42,10 @@ public class AppAdminPersonSimpleRespVO {
     @Schema(description = "更新时间")
     private LocalDateTime updateTime;
 
-    @Schema(description = "教育经历信息")
-    private List<AppAdminEduExpSimpleRespVO> eduExpList;
-
-    @Schema(description = "工作经验信息")
-    private List<AppAdminWorkExpSimpleRespVO> workExpList;
+    //    @Schema(description = "教育经历信息")
+    //    private List<AppAdminEduExpSimpleRespVO> eduExpList;
+    //
+    //    @Schema(description = "工作经验信息")
+    //    private List<AppAdminWorkExpSimpleRespVO> workExpList;
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/user/AppAdminUserController.java

@@ -2,6 +2,7 @@ package com.citu.module.menduner.system.controller.appadmin.user;
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.common.util.string.StrUtils;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
 import com.citu.module.menduner.system.controller.appadmin.user.vo.AppAdminUserRespVO;
 import com.citu.module.menduner.system.controller.appadmin.user.vo.AppAdminUserPageReqVO;
@@ -44,15 +45,15 @@ public class AppAdminUserController {
     @PreAuthenticated
     @PostMapping("/disable")
     @Operation(summary = "禁用账户")
-    public CommonResult<Boolean> disable(@RequestParam("id") Long id) {
-        return success(service.disable(id));
+    public CommonResult<Boolean> disable(@RequestParam("ids") String ids) {
+        return success(service.disable(StrUtils.splitToLong(ids)));
     }
 
     @PreAuthenticated
     @PostMapping("/enable")
     @Operation(summary = "启用账户")
-    public CommonResult<Boolean> enable(@RequestParam("id") Long id) {
-        return success(service.enable(id));
+    public CommonResult<Boolean> enable(@RequestParam("ids") String ids) {
+        return success(service.enable(StrUtils.splitToLong(ids)));
     }
 
 

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

@@ -38,20 +38,15 @@ public interface JobCvRelMapper extends BaseMapperX<JobCvRelDO> {
                 .orderByDesc(JobCvRelDO::getUpdateTime));
     }
 
+
+
     default PageResult<AppAdminJobCvRelRespVO> selectPage(AppAdminJobCvRelPageReqVO reqVO) {
         // 职位投递userId inner 招聘职位userId and 职位投递userId inner 人才信息userId
         // 人才信息userId inner 工作经验userId and 人才信息userId inner 教育经历userId
         MPJLambdaWrapperX<JobCvRelDO> wrapper = new MPJLambdaWrapperX<>();
         wrapper.selectAsClass(JobCvRelDO.class, AppAdminJobCvRelRespVO.class);
         wrapper.selectAssociation(JobAdvertisedDO.class, AppAdminJobCvRelRespVO::getJob);
-
-        wrapper.selectAssociation(PersonInfoDO.class, AppAdminJobCvRelRespVO::getPerson, p ->
-                p.collection(WorkExpDO.class, AppAdminPersonSimpleRespVO::getWorkExpList)
-                        .collection(EduExpDO.class, AppAdminPersonSimpleRespVO::getEduExpList)
-        );
-//        wrapper.selectCollection(WorkExpDO.class,AppAdminPersonSimpleRespVO::getWorkExpList);
-//        wrapper.selectCollection(EduExpDO.class,AppAdminPersonSimpleRespVO::getEduExpList);
-
+        wrapper.selectAssociation(PersonInfoDO.class, AppAdminJobCvRelRespVO::getPerson);
 
         // 投递的职位 inner 招聘职位
         wrapper.innerJoin(JobAdvertisedDO.class, JobAdvertisedDO::getId, JobCvRelDO::getJobId);
@@ -68,11 +63,6 @@ public interface JobCvRelMapper extends BaseMapperX<JobCvRelDO> {
         wrapper.likeIfExists(PersonInfoDO::getName, reqVO.getName());
         wrapper.likeIfExists(PersonInfoDO::getUserId, reqVO.getUserId());
 
-        // 项目经验、教育经历的连接
-        wrapper.leftJoin(WorkExpDO.class, WorkExpDO::getUserId, PersonInfoDO::getUserId);
-        wrapper.leftJoin(EduExpDO.class, EduExpDO::getUserId, PersonInfoDO::getUserId);
-
-
         wrapper.orderByDesc(JobCvRelDO::getUpdateTime);
         return selectJoinPage(reqVO, AppAdminJobCvRelRespVO.class, wrapper);
     }

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

@@ -39,23 +39,4 @@ public interface PersonInfoMapper extends BaseMapperX<PersonInfoDO> {
     }
 
 
-    default PageResult<AppAdminPersonSimpleRespVO> selectSimplePersonPage(AppAdminPersonPageReqVO reqVO) {
-        MPJLambdaWrapperX<PersonInfoDO> wrapper = new MPJLambdaWrapperX<>();
-        wrapper.selectAsClass(PersonInfoDO.class, AppAdminPersonSimpleRespVO.class);
-        wrapper.selectCollection(WorkExpDO.class, AppAdminPersonSimpleRespVO::getWorkExpList);
-        wrapper.selectCollection(EduExpDO.class, AppAdminPersonSimpleRespVO::getEduExpList);
-        wrapper.leftJoin(WorkExpDO.class, WorkExpDO::getUserId, PersonInfoDO::getUserId);
-        wrapper.leftJoin(EduExpDO.class, EduExpDO::getUserId, PersonInfoDO::getUserId);
-        wrapper.eqIfPresent(PersonInfoDO::getJobStatus, reqVO.getJobStatus());
-        wrapper.eqIfPresent(PersonInfoDO::getEduType, reqVO.getEduType());
-        wrapper.eqIfPresent(PersonInfoDO::getExpType, reqVO.getExpType());
-        wrapper.likeIfPresent(PersonInfoDO::getName, reqVO.getName());
-        wrapper.inIfPresent(PersonInfoDO::getUserId, reqVO.getUserId());
-
-        wrapper.orderByDesc(WorkExpDO::getStartTime);
-        wrapper.orderByDesc(EduExpDO::getStartTime);
-        wrapper.orderByDesc(PersonInfoDO::getUpdateTime);
-        return selectJoinPage(reqVO, AppAdminPersonSimpleRespVO.class, wrapper);
-    }
-
 }

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

@@ -118,15 +118,15 @@ public interface EnterpriseUserBindService {
 
     /**
      * 禁用账号
-     * @return id
+     * @return ids
      **/
-    boolean disable(Long id);
+    boolean disable(List<Long> ids);
 
     /**
      * 启用账户
-     * @return id
+     * @return ids
      **/
-    boolean enable(Long id);
+    boolean enable(List<Long> ids);
 
     /**
      * 获取用户列表分页数据

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

@@ -2,7 +2,6 @@ package com.citu.module.menduner.system.service.enterprise.bind;
 
 
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
-import com.citu.framework.common.enums.UserTypeEnum;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.framework.security.core.LoginUser;
@@ -33,7 +32,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import static com.citu.framework.common.exception.enums.GlobalErrorCodeConstants.FORBIDDEN;
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.*;
 import static com.citu.module.menduner.system.util.LoginUserContext.checkUserTypeIsAdmin;
@@ -222,24 +220,30 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
 
     @Override
     @DSTransactional
-    public boolean disable(Long id) {
-        EnterpriseUserBindDO userBindDO = valid(id);
-        if (MendunerStatusEnum.DISABLE.getStatus().equals(userBindDO.getStatus())) {
-            throw exception(MDE_ENTERPRISE_USER_BIND_IS_DISABLE);
+    public boolean disable(List<Long> ids) {
+        for (Long id : ids) {
+            EnterpriseUserBindDO userBindDO = valid(id);
+            if (MendunerStatusEnum.DISABLE.getStatus().equals(userBindDO.getStatus())) {
+                throw exception(MDE_ENTERPRISE_USER_BIND_IS_DISABLE);
+            }
+            userBindDO.setStatus(MendunerStatusEnum.DISABLE.getStatus());
+            enterpriseUserBindMapper.updateById(userBindDO);
         }
-        userBindDO.setStatus(MendunerStatusEnum.DISABLE.getStatus());
-        return enterpriseUserBindMapper.updateById(userBindDO) == 1;
+        return true;
     }
 
     @Override
     @DSTransactional
-    public boolean enable(Long id) {
-        EnterpriseUserBindDO userBindDO = valid(id);
-        if (MendunerStatusEnum.ENABLE.getStatus().equals(userBindDO.getStatus())) {
-            return true;
+    public boolean enable(List<Long> ids) {
+        for (Long id : ids) {
+            EnterpriseUserBindDO userBindDO = valid(id);
+            if (MendunerStatusEnum.ENABLE.getStatus().equals(userBindDO.getStatus())) {
+                return true;
+            }
+            userBindDO.setStatus(MendunerStatusEnum.ENABLE.getStatus());
+            enterpriseUserBindMapper.updateById(userBindDO);
         }
-        userBindDO.setStatus(MendunerStatusEnum.ENABLE.getStatus());
-        return enterpriseUserBindMapper.updateById(userBindDO) == 1;
+        return true;
     }
 
     private EnterpriseUserBindDO valid(Long id) {
@@ -263,6 +267,6 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
     @Override
     public PageResult<AppAdminUserRespVO> selectPage(AppAdminUserPageReqVO reqVO) {
         LoginUser loginUser = checkUserTypeIsAdmin();
-        return enterpriseUserBindMapper.selectPage(reqVO,  LoginUserContext.getEnterpriseId(loginUser));
+        return enterpriseUserBindMapper.selectPage(reqVO, LoginUserContext.getEnterpriseId(loginUser));
     }
 }

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

@@ -81,9 +81,6 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
     @Resource
     private AreaService areaService;
 
-    @Resource
-    private PersonInfoMapper personInfoMapper;
-
     @Resource
     private ElasticsearchRestTemplate elasticsearchTemplate;
 
@@ -275,7 +272,6 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
 
     @Override
     public PageResult<AppAdminJobCvRelRespVO> page(AppAdminJobCvRelPageReqVO reqVO) {
-
         PageResult<AppAdminJobCvRelRespVO> pageResult = jobCvRelMapper.selectPage(reqVO);
         if (CollUtil.isEmpty(pageResult.getList())) {
             return PageResult.empty();