1、整合简历查询接口

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/BossApiController.java

@@ -6,13 +6,16 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.BossApiService;
+import org.jeecg.modules.employContract.entity.EmployContract;
 import org.jeecg.modules.employJob.entity.EmployJob;
+import org.jeecg.modules.employResume.entity.EmployResume;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
 @Api(tags="小程序-Boss相关接口")
 @RestController
@@ -24,32 +27,32 @@ public class BossApiController {
     @Resource
     private BossApiService bossApiService;
 
-    //首页-获取找活信息列表带分页
+//    //首页-获取找活信息列表带分页
+//    @ApiOperation(value="首页-获取简历列表", notes="首页-获取简历列表")
+//    @RequestMapping(value = "/queryJobList", method = {RequestMethod.GET})
+//    public Result<?> queryResumeList(PageBean pageBean){
+//        return bossApiService.queryResumeList(pageBean);
+//    }
+//
+//    //首页-根据岗工种查询简历列表
+//    @ApiOperation(value="首页-根据工种查询简历列表", notes="首页-根据工种查询简历列表")
+//    @RequestMapping(value = "/queryResumeListByName", method = {RequestMethod.GET})
+//    public Result<?> queryResumeListByName(String typeId, PageBean pageBean){
+//        return bossApiService.queryResumeListByName(typeId, pageBean);
+//    }
+//
+//    //首页-根据工作性质查询简历列表
+//    @ApiOperation(value="首页-根据工作性质查询简历列表", notes="首页-根据工作性质查询简历列表")
+//    @RequestMapping(value = "/queryResumeListByNature", method = {RequestMethod.GET})
+//    public Result<?> queryResumeListByNature(String natureId, PageBean pageBean){
+//        return bossApiService.queryResumeListByNature(natureId, pageBean);
+//    }
+
+    //首页-
     @ApiOperation(value="首页-获取简历列表", notes="首页-获取简历列表")
-    @RequestMapping(value = "/queryJobList", method = {RequestMethod.GET})
-    public Result<?> queryResumeList(PageBean pageBean){
-        return bossApiService.queryResumeList(pageBean);
-    }
-
-    //首页-根据岗工种查询简历列表
-    @ApiOperation(value="首页-根据工种查询简历列表", notes="首页-根据工种查询简历列表")
-    @RequestMapping(value = "/queryResumeListByName", method = {RequestMethod.GET})
-    public Result<?> queryResumeListByName(String typeId, PageBean pageBean){
-        return bossApiService.queryResumeListByName(typeId, pageBean);
-    }
-
-    //首页-根据工作性质查询简历列表
-    @ApiOperation(value="首页-根据工作性质查询简历列表", notes="首页-根据工作性质查询简历列表")
-    @RequestMapping(value = "/queryResumeListByNature", method = {RequestMethod.GET})
-    public Result<?> queryResumeListByNature(String natureId, PageBean pageBean){
-        return bossApiService.queryResumeListByNature(natureId, pageBean);
-    }
-
-    //首页-智能推荐查询找活信息
-    @ApiOperation(value="首页-智能推荐查询简历列表", notes="首页-智能推荐查询简历列表")
     @RequestMapping(value = "/queryResumeListByAll", method = {RequestMethod.GET})
-    public Result<?> queryResumeListByAll(){
-        return Result.OK("接口内容暂未处理");
+    public Result<?> queryResumeListByAll(EmployResume employResume, PageBean pageBean, HttpServletRequest req){
+        return bossApiService.queryResumeListByAll(employResume, pageBean, req);
     }
 
     //首页-根据Id查看简历详情
@@ -91,8 +94,8 @@ public class BossApiController {
     //我的服务-电子合同
     @ApiOperation(value="电子合同-获取电子合同列表", notes="电子合同-获取电子合同列表")
     @RequestMapping(value = "/queryContractList", method = {RequestMethod.GET})
-    public Result<?> queryContractList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
-        return bossApiService.queryContractList(token, pageBean);
+    public Result<?> queryContractList(EmployContract employContract, PageBean pageBean, HttpServletRequest req){
+        return bossApiService.queryContractList(employContract, pageBean, req);
     }
 
     //我的服务-电子合同

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/BossApiService.java

@@ -2,23 +2,30 @@ package org.jeecg.modules.apiService;
 
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.employContract.entity.EmployContract;
 import org.jeecg.modules.employJob.entity.EmployJob;
+import org.jeecg.modules.employResume.entity.EmployResume;
+
+import javax.servlet.http.HttpServletRequest;
 
 public interface BossApiService {
 
     /***************首页***************/
 
-    //首页-获取简历列表带分页
-    public Result<?> queryResumeList(PageBean pageBean);
-
+//    //首页-获取简历列表带分页
+//    public Result<?> queryResumeList(PageBean pageBean);
+//
     //首页-根据Id查看简历详情
     public Result<?> queryResumeById(String resumeId);
-
-    //首页-根据工种查询简历列表带分页
-    public Result<?> queryResumeListByName(String jobType, PageBean pageBean);
+//
+//    //首页-根据工种查询简历列表带分页
+//    public Result<?> queryResumeListByName(String jobType, PageBean pageBean);
+//
+//    //首页-根据工作性质查询简历列表带分页
+//    public Result<?> queryResumeListByNature(String jobNature, PageBean pageBean);
 
     //首页-根据工作性质查询简历列表带分页
-    public Result<?> queryResumeListByNature(String jobNature, PageBean pageBean);
+    public Result<?> queryResumeListByAll(EmployResume employResume, PageBean pageBean, HttpServletRequest req);
 
     //首页-发布招工
     public Result<?> addJob(String token, EmployJob employJob);
@@ -34,7 +41,7 @@ public interface BossApiService {
     public Result<?> queryWatchMe(String token, PageBean pageBean);
 
     //电子合同-获取电子合同列表
-    public Result<?> queryContractList(String token, PageBean pageBean);
+    public Result<?> queryContractList(EmployContract employContract, PageBean pageBean, HttpServletRequest req);
 
     //电子合同-获取电子合同详情
     public Result<?> queryContracById(String token, String contractId);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BossApiServiceImpl.java

@@ -1,7 +1,10 @@
 package org.jeecg.modules.apiService.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.BossApiService;
@@ -22,6 +25,7 @@ import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 @Service
@@ -58,17 +62,17 @@ public class BossApiServiceImpl implements BossApiService {
     /****************************************************************************************/
     /****************************************************************************************/
 
-    //首页-获取简历列表带分页
-    @Override
-    public Result<?> queryResumeList(PageBean pageBean) {
-        Page<EmployResume> page = new Page<EmployResume>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<EmployResume> pageList = employResumeService
-                .lambdaQuery()
-                .page(page);
-
-        return Result.OK("简历列表", pageList);
-    }
-
+//    //首页-获取简历列表带分页
+//    @Override
+//    public Result<?> queryResumeList(PageBean pageBean) {
+//        Page<EmployResume> page = new Page<EmployResume>(pageBean.getPageNo(), pageBean.getPageSize());
+//        Page<EmployResume> pageList = employResumeService
+//                .lambdaQuery()
+//                .page(page);
+//
+//        return Result.OK("简历列表", pageList);
+//    }
+//
     //首页-根据Id查看简历详情
     @Override
     public Result<?> queryResumeById(String resumeId) {
@@ -79,28 +83,37 @@ public class BossApiServiceImpl implements BossApiService {
 
         return Result.OK("简历详情", one);
     }
-
-    //首页-根据岗工种查询简历列表
-    @Override
-    public Result<?> queryResumeListByName(String typeId, PageBean pageBean) {
-        Page<EmployResume> page = new Page<EmployResume>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<EmployResume> pageList = employResumeService
-                .lambdaQuery()
-                .eq(EmployResume::getTypeId, typeId)
-                .page(page);
-
-        return Result.OK("简历列表", pageList);
-    }
-
-    //首页-根据工作性质查询简历列表
+//
+//    //首页-根据岗工种查询简历列表
+//    @Override
+//    public Result<?> queryResumeListByName(String typeId, PageBean pageBean) {
+//        Page<EmployResume> page = new Page<EmployResume>(pageBean.getPageNo(), pageBean.getPageSize());
+//        Page<EmployResume> pageList = employResumeService
+//                .lambdaQuery()
+//                .eq(EmployResume::getTypeId, typeId)
+//                .page(page);
+//
+//        return Result.OK("简历列表", pageList);
+//    }
+//
+//    //首页-根据工作性质查询简历列表
+//    @Override
+//    public Result<?> queryResumeListByNature(String natureId, PageBean pageBean) {
+//        Page<EmployResume> page = new Page<EmployResume>(pageBean.getPageNo(), pageBean.getPageSize());
+//        Page<EmployResume> pageList = employResumeService
+//                .lambdaQuery()
+//                .eq(EmployResume::getNatureId, natureId)
+//                .page(page);
+//
+//        return Result.OK("简历列表", pageList);
+//    }
+
+    //获取所有简历带分页
     @Override
-    public Result<?> queryResumeListByNature(String natureId, PageBean pageBean) {
+    public Result<?> queryResumeListByAll(EmployResume employResume, PageBean pageBean, HttpServletRequest req) {
+        QueryWrapper<EmployResume> queryWrapper = QueryGenerator.initQueryWrapper(employResume, req.getParameterMap());
         Page<EmployResume> page = new Page<EmployResume>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<EmployResume> pageList = employResumeService
-                .lambdaQuery()
-                .eq(EmployResume::getNatureId, natureId)
-                .page(page);
-
+        Page<EmployResume> pageList = employResumeService.page(page, queryWrapper);
         return Result.OK("简历列表", pageList);
     }
 
@@ -192,27 +205,36 @@ public class BossApiServiceImpl implements BossApiService {
 
     //电子合同-获取电子合同列表
     @Override
-    public Result<?> queryContractList(String token, PageBean pageBean) {
-        //权限验证
-        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+    public Result<?> queryContractList(EmployContract employContract, PageBean pageBean, HttpServletRequest req) {
 
-        Page<EmployContract> page = new Page<EmployContract>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<EmployContract> pageList = employContractService
-                .lambdaQuery()
-                .eq(EmployContract::getCompanyId, hanHaiMember.getId())
-                .page(page);
+//        Page<EmployContract> page = new Page<EmployContract>(pageBean.getPageNo(), pageBean.getPageSize());
+//        Page<EmployContract> pageList = employContractService
+//                .lambdaQuery()
+//                .eq(EmployContract::getCompanyId, hanHaiMember.getId())
+//                .page(page);
+//
+//        return Result.OK("电子合同列表", pageList);
 
+//        //权限验证
+//        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+//        employContract.setCompanyId(hanHaiMember.getId());
+
+        QueryWrapper<EmployContract> queryWrapper = QueryGenerator.initQueryWrapper(employContract, req.getParameterMap());
+        Page<EmployContract> page = new Page<EmployContract>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<EmployContract> pageList = employContractService.page(page, queryWrapper);
         return Result.OK("电子合同列表", pageList);
+
     }
 
     //电子合同-获取电子合同详情
     @Override
     public Result<?> queryContracById(String token, String contractId) {
         //权限验证
-        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
         EmployContract one = employContractService
                 .lambdaQuery()
+                //.eq(EmployContract::getPersonId, hanHaiMember.getId())
                 .eq(EmployContract::getId, contractId)
                 .one();