1、接口内容添加

2、补充小程序appid和app密钥

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

@@ -58,8 +58,8 @@ public class BossApiController {
     //首页-根据Id查看简历详情
     @ApiOperation(value="首页-根据Id查看简历详情", notes="首页-根据Id查看简历详情")
     @RequestMapping(value = "/queryResumeById", method = {RequestMethod.GET})
-    public Result<?> queryResumeById(String resumeId){
-        return bossApiService.queryResumeById(resumeId);
+    public Result<?> queryResumeById(String token, String resumeId){
+        return bossApiService.queryResumeById(token, resumeId);
     }
 
     //首页-发布招工
@@ -80,15 +80,15 @@ public class BossApiController {
     //会员中心-联系记录-我看过谁(我的招工)
     @ApiOperation(value="会员中心-联系记录-我看过谁", notes="会员中心-联系记录-我看过谁")
     @RequestMapping(value = "/queryWatchWho", method = {RequestMethod.GET})
-    public Result<?> queryWatchWho(PageBean pageBean){
-        return bossApiService.queryWatchWho(pageBean);
+    public Result<?> queryWatchWho(String token, PageBean pageBean){
+        return bossApiService.queryWatchWho(token, pageBean);
     }
 
     //会员中心-联系记录-谁看过我(谁看过我的招工)
     @ApiOperation(value="会员中心-联系记录-谁看过我(谁看过我的招工)", notes="会员中心-联系记录-谁看过我(谁看过我的招工)")
     @RequestMapping(value = "/queryWatchMe", method = {RequestMethod.GET})
-    public Result<?> queryWatchMe(PageBean pageBean){
-        return bossApiService.queryWatchMe(pageBean);
+    public Result<?> queryWatchMe(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
+        return bossApiService.queryWatchMe(token, pageBean);
     }
 
     //会员中心-联系记录-我看过谁(我的招工)

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

@@ -130,16 +130,16 @@ public class CommonApiController {
 
     /***************会员中心***************/
     //会员中心-正式积分||临时积分
-    @ApiOperation(value="会员中心-正式积分||临时积分", notes="type：0-正式积分 1-临时积分")
+    @ApiOperation(value="会员中心-正式积分||临时积分", notes="正式积分||临时积分||当前积分")
     @RequestMapping(value = "/queryScore", method = {RequestMethod.GET})
-    public Result<?> queryScore(String token, String type){
-        return commonApiService.queryScore(token, type);
+    public Result<?> queryScore(@RequestHeader("X-Access-Token") String token){
+        return commonApiService.queryScore(token);
     }
 
     //会员中心-积分记录
     @ApiOperation(value="会员中心-积分记录", notes="type：0-收入 1-消耗")
     @RequestMapping(value = "/queryScoreRecord", method = {RequestMethod.GET})
-    public Result<?> queryScoreRecord(String type, PageBean pageBean){
+    public Result<?> queryScoreRecord(@RequestHeader("X-Access-Token") String type, PageBean pageBean){
         return commonApiService.queryScoreRecord(type, pageBean);
     }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/EmployeeApiController.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.EmployeeApiService;
+import org.jeecg.modules.employJob.entity.EmployJob;
 import org.jeecg.modules.employRedister.entity.EmployRedister;
+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="小程序-Employee相关接口")
 @RestController
@@ -26,53 +29,18 @@ public class EmployeeApiController {
 
 
     /***************首页***************/
-    //首页-获取工作信息列表带分页
-    @ApiOperation(value="首页-获取工作信息列表", notes="首页-获取工作信息列表")
-    @RequestMapping(value = "/queryJobList", method = {RequestMethod.GET})
-    public Result<?> queryJobList(PageBean pageBean){
-        return employeeApiService.queryJobList(pageBean);
-    }
-
-    //首页-根据岗位/公司名称模糊查询工作信息
-    @ApiOperation(value="首页-根据岗位/公司名称模糊查询工作信息", notes="type: 0-岗位名称 1-公司名称")
-    @RequestMapping(value = "/queryJobListByName", method = {RequestMethod.GET})
-    public Result<?> queryJobListByName(String type, String name, PageBean pageBean){
-        return employeeApiService.queryJobListByName(type, name, pageBean);
-    };
-
-    //首页-根据地址模糊查询工作信息
-    @ApiOperation(value="首页-根据地址模糊查询工作信息", notes="首页-根据地址模糊查询工作信息")
-    @RequestMapping(value = "/queryJobListByAddress", method = {RequestMethod.GET})
-    public Result<?> queryJobListByAddress(String address, PageBean pageBean){
-        return employeeApiService.queryJobListByAddress(address,pageBean);
-    }
-
-    //首页-根据工种类型查询工作信息
-    @ApiOperation(value="首页-根据工种类型查询工作信息", notes="首页-根据工种类型查询工作信息")
-    @RequestMapping(value = "/queryJobListByType", method = {RequestMethod.GET})
-    public Result<?> queryJobListByType(String typeId, PageBean pageBean){
-        return employeeApiService.queryJobListByType(typeId, pageBean);
-    }
-
-    //首页-根据工作性质查询工作信息
-    @ApiOperation(value="首页-根据工作性质查询工作信息", notes="首页-根据工作性质查询工作信息")
-    @RequestMapping(value = "/queryJobListByNature", method = {RequestMethod.GET})
-    public Result<?> queryJobListByNature(String natureId, PageBean pageBean){
-        return employeeApiService.queryJobListByNature(natureId, pageBean);
-    }
-
     //首页-智能推荐查询工作信息
-    @ApiOperation(value="首页-智能推荐查询工作信息", notes="首页-智能推荐查询工作信息")
+    @ApiOperation(value="首页-查询工作信息", notes="首页-查询工作信息")
     @RequestMapping(value = "/queryJobListByAll", method = {RequestMethod.GET})
-    public Result<?> queryJobListByAll(){
-        return Result.OK("接口内容暂未处理");
+    public Result<?> queryJobListByAll(EmployJob employJob, PageBean pageBean, HttpServletRequest req){
+        return employeeApiService.queryJobListByAll(employJob, pageBean, req);
     }
 
     //首页-根据Id查看工作详情
     @ApiOperation(value="首页-根据Id查看工作详情", notes="首页-根据Id查看工作详情")
     @RequestMapping(value = "/queryJobById", method = {RequestMethod.GET})
-    public Result<?> queryJobById(String jobId){
-        return employeeApiService.queryJobById(jobId);
+    public Result<?> queryJobById(String token, String jobId){
+        return employeeApiService.queryJobById(token, jobId);
     }
 
     //首页-发布找活
@@ -93,8 +61,8 @@ public class EmployeeApiController {
     //考证咨询-提交报名材料
     @ApiOperation(value="考证咨询-提交报名材料", notes="考证咨询-提交报名材料")
     @RequestMapping(value = "/addMaterial", method = {RequestMethod.POST})
-    public Result<?> addMaterial(EmployRedister employRedister){
-        return employeeApiService.addMaterial(employRedister);
+    public Result<?> addMaterial(@RequestHeader("X-Access-Token") String token, EmployRedister employRedister){
+        return employeeApiService.addMaterial(token, employRedister);
     }
 
     //考证咨询-联系客服
@@ -108,43 +76,43 @@ public class EmployeeApiController {
     //会员中心-我的收藏
     @ApiOperation(value="会员中心-我的收藏", notes="会员中心-我的收藏")
     @RequestMapping(value = "/queryJobCollectionList", method = {RequestMethod.GET})
-    public Result<?> queryCollectionList(PageBean pageBean){
-        return employeeApiService.queryJobCollectionList(pageBean);
+    public Result<?> queryCollectionList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
+        return employeeApiService.queryJobCollectionList(token, pageBean);
     }
 
     //会员中心-联系记录-我看过谁
     @ApiOperation(value="会员中心-联系记录-我看过谁", notes="会员中心-联系记录-我看过谁")
     @RequestMapping(value = "/queryWatchWho", method = {RequestMethod.GET})
-    public Result<?> queryWatchWho(PageBean pageBean){
-        return employeeApiService.queryWatchWho(pageBean);
+    public Result<?> queryWatchWho(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
+        return employeeApiService.queryWatchWho(token, pageBean);
     }
 
     //会员中心-联系记录-我看过谁
     @ApiOperation(value="会员中心-联系记录-谁看过我(谁看过我的简历)", notes="会员中心-联系记录-谁看过我(谁看过我的简历)")
     @RequestMapping(value = "/queryWatchMe", method = {RequestMethod.GET})
-    public Result<?> queryWatchMe(PageBean pageBean){
-        return employeeApiService.queryWatchMe(pageBean);
+    public Result<?> queryWatchMe(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
+        return employeeApiService.queryWatchMe(token, pageBean);
     }
 
     //会员中心-我的找活
     @ApiOperation(value="会员中心-我的找活", notes="会员中心-我的找活")
     @RequestMapping(value = "/queryResumeByUserId", method = {RequestMethod.GET})
-    public Result<?> queryResumeByUserId(String token, PageBean pageBean){
+    public Result<?> queryResumeByUserId(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
         return employeeApiService.queryResumeByUserId(token, pageBean);
     }
 
     //我的服务-电子合同
     @ApiOperation(value="电子合同-获取电子合同列表", notes="电子合同-获取电子合同列表")
     @RequestMapping(value = "/queryContractList", method = {RequestMethod.GET})
-    public Result<?> queryContractList(PageBean pageBean){
-        return employeeApiService.queryContractList(pageBean);
+    public Result<?> queryContractList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
+        return employeeApiService.queryContractList(token, pageBean);
     }
 
     //我的服务-电子合同
     @ApiOperation(value="电子合同-根据id查询电子合同详情", notes="电子合同-根据id查询电子合同详情")
     @RequestMapping(value = "/queryContracById", method = {RequestMethod.GET})
-    public Result<?> queryContracById(String contractId){
-        return employeeApiService.queryContracById(contractId);
+    public Result<?> queryContracById(@RequestHeader("X-Access-Token") String token, String contractId){
+        return employeeApiService.queryContracById(token, contractId);
     }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/ScoreBean.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.apiBean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ScoreBean {
+    @ApiModelProperty(value = "正式积分" )
+    double formalScore;//正式积分
+    @ApiModelProperty(value = "临时积分" )
+    double tempScore;//临时积分
+    @ApiModelProperty(value = "当前积分" )
+    double currentScore;//当前积分
+}

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

@@ -12,21 +12,11 @@ public interface BossApiService {
 
     /***************首页***************/
 
-//    //首页-获取简历列表带分页
-//    public Result<?> queryResumeList(PageBean pageBean);
-//
-//
-//    //首页-根据工种查询简历列表带分页
-//    public Result<?> queryResumeListByName(String jobType, PageBean pageBean);
-//
-//    //首页-根据工作性质查询简历列表带分页
-//    public Result<?> queryResumeListByNature(String jobNature, PageBean pageBean);
-
-    //首页-根据工作性质查询简历列表带分页
+    //首页-查询简历列表带分页
     public Result<?> queryResumeListByAll(EmployResume employResume, PageBean pageBean, HttpServletRequest req);
 
     //首页-根据Id查看简历详情
-    public Result<?> queryResumeById(String resumeId);
+    public Result<?> queryResumeById(String token, String resumeId);
 
     //首页-发布招工
     public Result<?> addJob(EmployJob employJob);
@@ -36,10 +26,10 @@ public interface BossApiService {
     public Result<?> queryJobCollectionList(PageBean pageBean);
 
     //会员中心-联系记录-我看过谁
-    public Result<?> queryWatchWho(PageBean pageBean);
+    public Result<?> queryWatchWho(String token, PageBean pageBean);
 
     //会员中心-联系记录-我看过谁(我的找活)
-    public Result<?> queryWatchMe(PageBean pageBean);
+    public Result<?> queryWatchMe(String token, PageBean pageBean);
 
     //会员中心-联系记录-我的招工
     public Result<?> queryJobListByUserId(String token, PageBean pageBean);

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

@@ -44,7 +44,7 @@ public interface CommonApiService {
 
     /***************会员中心***************/
     //会员中心-正式积分||临时积分
-    public Result<?> queryScore(String token, String type);
+    public Result<?> queryScore(String token);
 
     //会员中心-积分记录
     public Result<?> queryScoreRecord(String type, PageBean pageBean);

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

@@ -2,28 +2,20 @@ package org.jeecg.modules.apiService;
 
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.employJob.entity.EmployJob;
 import org.jeecg.modules.employRedister.entity.EmployRedister;
 
+import javax.servlet.http.HttpServletRequest;
+
 public interface EmployeeApiService {
 
     /***************首页***************/
-    //首页-获取工作信息列表
-    public Result<?> queryJobList(PageBean pageBean);
-
-    //首页-根据岗位/公司名称模糊查询工作信息
-    public Result<?> queryJobListByName(String jobType, String companyName, PageBean pageBean);
-
-    //首页-根据地址模糊查询工作信息
-    public Result<?> queryJobListByAddress(String address, PageBean pageBean);
-
-    //首页-根据工种类型查询工作信息
-    public Result<?> queryJobListByType(String typeId, PageBean pageBean);
 
-    //首页-根据工作性质查询工作信息
-    public Result<?> queryJobListByNature(String natureId, PageBean pageBean);
+    //首页-查询工作信息列表
+    public Result<?> queryJobListByAll(EmployJob employJob, PageBean pageBean, HttpServletRequest req);
 
     //首页-获取工作详情
-    public Result<?> queryJobById(String jobId);
+    public Result<?> queryJobById(String token, String jobId);
 
     /***************考证咨询***************/
     //考证咨询-证书查询
@@ -31,28 +23,28 @@ public interface EmployeeApiService {
 
     //考证咨询-提交报名材料
     //考证咨询-提交报名材料
-    public Result<?> addMaterial(EmployRedister employRedister);
+    public Result<?> addMaterial(String token, EmployRedister employRedister);
 
 
     //考证咨询-联系客服
 
     /***************会员中心***************/
     //会员中心-我的收藏
-    public Result<?> queryJobCollectionList(PageBean pageBean);
+    public Result<?> queryJobCollectionList(String token, PageBean pageBean);
 
     //会员中心-联系记录-我看过谁
-    public Result<?> queryWatchWho(PageBean pageBean);
+    public Result<?> queryWatchWho(String token, PageBean pageBean);
 
-    //会员中心-联系记录-谁看过我(谁看过我的找活)
-    public Result<?> queryWatchMe(PageBean pageBean);
+    //会员中心-联系记录-谁看过我(谁看过我的简历)
+    public Result<?> queryWatchMe(String token, PageBean pageBean);
 
     //会员中心-我的找活
     public Result<?> queryResumeByUserId(String token, PageBean pageBean);
 
     //电子合同-获取电子合同列表
-    public Result<?> queryContractList(PageBean pageBean);
+    public Result<?> queryContractList(String token, PageBean pageBean);
 
     //电子合同-获取电子合同详情
-    public Result<?> queryContracById(String contractId);
+    public Result<?> queryContracById(String token, String contractId);
 
 }

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

@@ -64,42 +64,6 @@ 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<?> 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<?> queryResumeListByAll(EmployResume employResume, PageBean pageBean, HttpServletRequest req) {
@@ -111,12 +75,23 @@ public class BossApiServiceImpl implements BossApiService {
 
     //首页-根据Id查看简历详情
     @Override
-    public Result<?> queryResumeById(String resumeId) {
+    public Result<?> queryResumeById(String token, String resumeId) {
         EmployResume one = employResumeService
                 .lambdaQuery()
                 .eq(EmployResume::getId, resumeId)
                 .one();
 
+        //添加简历被查看记录
+        if(null != token){
+            //权限验证
+            HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+            EmployCheckResume employCheckResume = new EmployCheckResume();
+            employCheckResume.setResumeId(one.getId());
+            employCheckResume.setUserId(hanHaiMember.getId());
+            employCheckResumeService.saveOrUpdate(employCheckResume);
+        }
+
         return Result.OK("简历详情", one);
     }
 
@@ -168,41 +143,39 @@ public class BossApiServiceImpl implements BossApiService {
 
     //会员中心-联系记录-我看过谁
     @Override
-    public Result<?> queryWatchWho(PageBean pageBean) {
+    public Result<?> queryWatchWho(String token, PageBean pageBean) {
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
+        //查看简历查看记录
         Page<EmployCheckResume> page = new Page<EmployCheckResume>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<EmployCheckResume> pageList = employCheckResumeService
                 .lambdaQuery()
-                //.eq(EmployCheckResume::getUserId, hanHaiMember.getId())
+                .eq(EmployCheckResume::getUserId, hanHaiMember.getId())
                 .page(page);
 
-        return Result.OK("我看过谁列表", pageList);
+        List<EmployResume> resumeList = new ArrayList<>();
+        for (EmployCheckResume record : pageList.getRecords()) {
+            EmployResume employResume = employResumeService.getById(record.getResumeId());
+            resumeList.add(employResume);
+        }
+
+        return Result.OK("我看过谁", resumeList);
     }
 
     //会员中心-联系记录-谁看过我(谁看过我的招工)
     @Override
-    public Result<?> queryWatchMe(PageBean pageBean) {
+    public Result<?> queryWatchMe(String token, PageBean pageBean) {
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
         //查询我发布的工作
-//        EmployJob job = employJobService
-//                .lambdaQuery()
-//                //.eq(EmployJob::getUserId, hanHaiMember.getId())
-//                .one();
         List<EmployJob> jobList = employJobService
                 .lambdaQuery()
-                //.eq(EmployJob::getUserId, hanHaiMember.getId())
+                .eq(EmployJob::getUserId, hanHaiMember.getId())
                 .list();
 
         //获取工作被查询的记录
-//        List<EmployCheckJob> checkJobList = employCheckJobService
-//                .lambdaQuery()
-//                .eq(EmployCheckJob::getJobId, job.getId())
-//                .list();
-
         List<EmployCheckJob> lists = new ArrayList<>();
         for (EmployJob job : jobList) {
             List<EmployCheckJob> checkJobList1 = employCheckJobService
@@ -221,6 +194,10 @@ public class BossApiServiceImpl implements BossApiService {
             index++;
         }
 
+        if(index == 0){
+            return Result.OK("没有人看过我的招工", lists);
+        }
+
         //根据求职者id查询求职者简历
         Page<EmployResume> page = new Page<EmployResume>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<EmployResume> pageList = employResumeService

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.apiBean.ScoreBean;
 import org.jeecg.modules.apiService.CommonApiService;
 import org.jeecg.modules.employAddress.entity.EmployAddress;
 import org.jeecg.modules.employAddress.service.IEmployAddressService;
@@ -246,37 +247,30 @@ public class CommonApiServiceImpl implements CommonApiService {
     /***************会员中心***************/
     //会员中心-正式积分||临时积分
     @Override
-    public Result<?> queryScore(String token, String type) {
+    public Result<?> queryScore(String token) {
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
-        String message = "获取积分失败";
-        EmployScore one = null;
-        switch (type){
-           case "0":
-               message = "正式积分";
-               one = employScoreService
-                       .lambdaQuery()
-                       //.eq(EmployScoreRecord::getUserId, hanHaiMember.getId())
-                       .eq(EmployScore::getUserId, "1830614749375053826")
-                       .eq(EmployScore::getType, type)
-                       .one();
-               break;
-           case "1":
-               message = "临时积分";
-               one = employScoreService
-                       .lambdaQuery()
-                       //.eq(EmployScoreRecord::getUserId, hanHaiMember.getId())
-                       .eq(EmployScore::getUserId, "1830614749375053826")
-                       .eq(EmployScore::getType, type)
-                       .one();
-               break;
-           default:
-               message = "积分类型输入错误，请重新输入：type：0-正式积分 1-临时积分";
-               break;
-        }
+        //正式积分
+        EmployScore one = employScoreService
+                .lambdaQuery()
+                .eq(EmployScore::getUserId, hanHaiMember.getId())
+                .eq(EmployScore::getType, "0")
+                .one();
 
-        return Result.OK(message, one);
+        EmployScore two = employScoreService
+                .lambdaQuery()
+                .eq(EmployScore::getUserId, hanHaiMember.getId())
+                .eq(EmployScore::getType, "1")
+                .one();
+
+        double three = one.getScore() + two.getScore();
+
+        ScoreBean scoreBean = new ScoreBean();
+        scoreBean.setFormalScore(one.getScore());
+        scoreBean.setTempScore(two.getScore());
+        scoreBean.setCurrentScore(three);
+        return Result.OK("积分信息", scoreBean);
     }
 
     //会员中心-积分记录
@@ -316,9 +310,9 @@ public class CommonApiServiceImpl implements CommonApiService {
     public Result<?> addVip(String token, EmployVipUser employVipUser) {
         String message = "";
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
-        //employVipUser.setUserId(hanHaiMember.getId());
+        employVipUser.setUserId(hanHaiMember.getId());
         //employVipUser.setTypeId(vipTypeId);
         boolean result = employVipUserService.save(employVipUser);
 

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

@@ -1,7 +1,10 @@
 package org.jeecg.modules.apiService.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.poi.hslf.blip.EMF;
 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.JobCollectionBean;
 import org.jeecg.modules.apiBean.PageBean;
@@ -29,6 +32,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.print.attribute.standard.MediaSize;
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -80,86 +84,36 @@ public class EmployeeApiServiceImpl implements EmployeeApiService {
 
     /**************************************首页***********************************************/
     /****************************************************************************************/
-
-    //首页-获取工作信息列表带分页
-    @Override
-    public Result<?> queryJobList(PageBean pageBean) {
-        Page<EmployJob> page = new Page<EmployJob>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<EmployJob> pageList = employJobService
-                .lambdaQuery()
-                .page(page);
-
-        return Result.OK("工作信息列表", pageList);
-    }
-
-    //首页-根据岗位/公司名称模糊查询工作信息type: 0-岗位 1-公司名称
-    @Override
-    public Result<?> queryJobListByName(String type, String name, PageBean pageBean) {
-        Page<EmployJob> page = new Page<EmployJob>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<EmployJob> pageList = null;
-
-        switch (type){
-            case "0":
-                pageList = employJobService
-                        .lambdaQuery()
-                        .like(EmployJob::getTitle, name)
-                        .page(page);
-                break;
-            case "1":
-                pageList = employJobService
-                        .lambdaQuery()
-                        .like(EmployJob::getCompany, name)
-                        .page(page);
-                break;
-        }
-
-        return Result.OK("工作信息列表", pageList);
-    }
-
-    //首页-根据地址模糊查询工作信息
-    @Override
-    public Result<?> queryJobListByAddress(String address, PageBean pageBean) {
-        Page<EmployJob> page = new Page<EmployJob>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<EmployJob> pageList = employJobService
-                .lambdaQuery()
-                .like(EmployJob::getWorkAddress, address)
-                .page(page);
-
-        return Result.OK("工作信息列表", pageList);
-    }
-
-    //首页-根据工种类型查询工作信息
+    //首页-查询工作信息列表
     @Override
-    public Result<?> queryJobListByType(String typeId, PageBean pageBean) {
+    public Result<?> queryJobListByAll(EmployJob employJob, PageBean pageBean, HttpServletRequest req) {
+        QueryWrapper<EmployJob> queryWrapper = QueryGenerator.initQueryWrapper(employJob, req.getParameterMap());
         Page<EmployJob> page = new Page<EmployJob>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<EmployJob> pageList = employJobService
-                .lambdaQuery()
-                .eq(EmployJob::getTypeId, typeId)
-                .page(page);
-
-        return Result.OK("工作信息列表", pageList);
-    }
-
-    //首页-根据工作性质查询工作信息
-    @Override
-    public Result<?> queryJobListByNature(String natureId, PageBean pageBean) {
-        Page<EmployJob> page = new Page<EmployJob>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<EmployJob> pageList = employJobService
-                .lambdaQuery()
-                .eq(EmployJob::getNatureId, natureId)
-                .page(page);
+        Page<EmployJob> pageList = employJobService.page(page, queryWrapper);
 
         return Result.OK("工作信息列表", pageList);
     }
 
     //首页-根据Id查看工作详情
     @Override
-    public Result<?> queryJobById(String jobId) {
+    public Result<?> queryJobById(String token, String jobId) {
+
         EmployJob one = employJobService
                 .lambdaQuery()
                 .eq(EmployJob::getId, jobId)
                 .one();
 
+        //添加工作被查看记录
+        if(null != token){
+            //权限验证
+            HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+            EmployCheckJob employCheckJob = new EmployCheckJob();
+            employCheckJob.setJobId(one.getId());
+            employCheckJob.setUserId(hanHaiMember.getId());
+            employCheckJobService.saveOrUpdate(employCheckJob);
+        }
+
         return Result.OK("工作详情", one);
     }
 
@@ -180,15 +134,15 @@ public class EmployeeApiServiceImpl implements EmployeeApiService {
 
     //考证咨询-提交报名材料
     @Override
-    public Result<?> addMaterial(EmployRedister employRedister) {
+    public Result<?> addMaterial(String token, EmployRedister employRedister) {
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
         //返回信息
         String message;
 
         //提交报名材料
-        //employRedister.setUserId(hanHaiMember.getId());
+        employRedister.setUserId(hanHaiMember.getId());
         boolean result = employRedisterService.save(employRedister);
 
         //判断招工信息是否添加成功
@@ -203,15 +157,15 @@ public class EmployeeApiServiceImpl implements EmployeeApiService {
     /***************会员中心***************/
     //会员中心-我的收藏
     @Override
-    public Result<?> queryJobCollectionList(PageBean pageBean) {
+    public Result<?> queryJobCollectionList(String token, PageBean pageBean) {
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
         //获取工作收藏列表
         Page<EmployCollectionJob> page = new Page<EmployCollectionJob>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<EmployCollectionJob> pageList = employCollectionJobService
                 .lambdaQuery()
-                //.eq(EmployCollectionJob::getUserId, hanHaiMember.getId())
+                .eq(EmployCollectionJob::getUserId, hanHaiMember.getId())
                 .page(page);
 
         //根据收藏列表工作id查询工作信息
@@ -229,42 +183,40 @@ public class EmployeeApiServiceImpl implements EmployeeApiService {
         return Result.OK("工作收藏列表", list);
     }
 
-    //会员中心-联系记录-我看过谁(我的找活)
+    //会员中心-联系记录-我看过谁
     @Override
-    public Result<?> queryWatchWho(PageBean pageBean) {
+    public Result<?> queryWatchWho(String token, PageBean pageBean) {
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
         Page<EmployCheckJob> page = new Page<EmployCheckJob>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<EmployCheckJob> pageList = employCheckJobService
                 .lambdaQuery()
-                //.eq(EmployCheckJob::getUserId, hanHaiMember.getId())
+                .eq(EmployCheckJob::getUserId, hanHaiMember.getId())
                 .page(page);
 
-        return Result.OK("工作查看列表", pageList);
+        List<EmployJob> jobList = new ArrayList<>();
+        for (EmployCheckJob record : pageList.getRecords()) {
+            EmployJob employJob = employJobService.getById(record.getJobId());
+            jobList.add(employJob);
+        }
+
+        return Result.OK("我看过谁", jobList);
     }
 
     //会员中心-联系记录-谁看过我(谁看过我的简历)
     @Override
-    public Result<?> queryWatchMe(PageBean pageBean) {
+    public Result<?> queryWatchMe(String token, PageBean pageBean) {
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
         //查询我的简历
-//        EmployResume one = employResumeService
-//                .lambdaQuery()
-//                //.eq(EmployResume::getUserId, hanHaiMember.getId())
-//                .one();
         List<EmployResume> list = employResumeService
                 .lambdaQuery()
-                //.eq(EmployResume::getUserId, hanHaiMember.getId())
+                .eq(EmployResume::getUserId, hanHaiMember.getId())
                 .list();
 
         //查询我的简历被查看的记录
-//        List<EmployCheckResume> list = employCheckResumeService
-//                .lambdaQuery()
-//                .eq(EmployCheckResume::getResumeId, one.getId())
-//                .list();
         List<EmployCheckResume> list1 = new ArrayList<>();
         for (EmployResume employResume : list) {
             List<EmployCheckResume> list2 = employCheckResumeService
@@ -274,7 +226,6 @@ public class EmployeeApiServiceImpl implements EmployeeApiService {
             list1.addAll(list2);
         }
 
-
         //获取查看我的简历的招聘人员id
         int size = (int)list1.size();
         Object[] objects = new Object[size];
@@ -284,6 +235,9 @@ public class EmployeeApiServiceImpl implements EmployeeApiService {
             index++;
         }
 
+        if(index == 0){
+            return Result.OK("没有人看过我的简历", list1);
+        }
         //根据招聘人员id查询发布的工作岗位
         Page<EmployJob> page = new Page<EmployJob>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<EmployJob> pageList = employJobService
@@ -291,20 +245,19 @@ public class EmployeeApiServiceImpl implements EmployeeApiService {
                 .in(EmployJob::getUserId,objects)
                 .page(page);
 
-        return Result.OK("谁看过我的简历列表", pageList);
+        return Result.OK("谁看过我的简历", pageList);
     }
 
     //会员中心-我的找活
     @Override
     public Result<?> queryResumeByUserId(String token, PageBean pageBean) {
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
         Page<EmployResume> page = new Page<EmployResume>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<EmployResume> pageList = employResumeService
                 .lambdaQuery()
-                //.eq(EmployResume::getUserId, hanHaiMember.getId())
-                .eq(EmployResume::getUserId, "1846405293308338177")
+                .eq(EmployResume::getUserId, hanHaiMember.getId())
                 .page(page);
 
         return Result.OK("我的找活", pageList);
@@ -312,14 +265,14 @@ public class EmployeeApiServiceImpl implements EmployeeApiService {
 
     //电子合同-获取电子合同列表
     @Override
-    public Result<?> queryContractList(PageBean pageBean) {
+    public Result<?> queryContractList(String token, PageBean pageBean) {
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
         Page<EmployContract> page = new Page<EmployContract>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<EmployContract> pageList = employContractService
                 .lambdaQuery()
-                .eq(EmployContract::getPersonId, "1846405293308338177")
+                .eq(EmployContract::getPersonId, hanHaiMember.getId())
                 .page(page);
 
         return Result.OK("电子合同列表", pageList);
@@ -327,9 +280,9 @@ public class EmployeeApiServiceImpl implements EmployeeApiService {
 
     //电子合同-获取电子合同详情
     @Override
-    public Result<?> queryContracById(String contractId) {
+    public Result<?> queryContracById(String token, String contractId) {
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
         EmployContract one = employContractService
                 .lambdaQuery()