Browse Source

1、多表数据使用框架实现分页分页

2、谁看过我的简历/发布的工作逻辑调整
master
Aug 4 months ago
parent
commit
10f5d7903f
22 changed files with 249 additions and 202 deletions
  1. +6
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/entity/EmployCheckJob.java
  2. +6
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/entity/EmployCheckResume.java
  3. +8
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/entity/EmployCollectionJob.java
  4. +7
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/entity/EmployCollectionResume.java
  5. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/controller/EmployContractController.java
  6. +2
    -2
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/entity/EmployContract.java
  7. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/mapper/EmployContractMapper.java
  8. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/IEmployContractService.java
  9. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/impl/EmployContractServiceImpl.java
  10. +2
    -2
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/EmployContractList.vue
  11. +2
    -2
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractForm.vue
  12. +2
    -2
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContract.data.ts
  13. +11
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java
  14. +9
    -9
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/BossApiController.java
  15. +8
    -8
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java
  16. +3
    -2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/EmployeeApiController.java
  17. +3
    -3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/BossApiService.java
  18. +3
    -3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CommonApiService.java
  19. +2
    -1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/EmployeeApiService.java
  20. +71
    -62
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BossApiServiceImpl.java
  21. +33
    -51
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java
  22. +67
    -51
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/EmployeeApiServiceImpl.java

+ 6
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckJob/entity/EmployCheckJob.java View File

@ -5,10 +5,12 @@ import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.modules.employJob.entity.EmployJob;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
@ -57,4 +59,8 @@ public class EmployCheckJob implements Serializable {
@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@ApiModelProperty(value = "关联用户id")
private java.lang.String userId;
//工作信息
@TableField(exist = false)
private EmployJob employJob;
}

+ 6
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCheckResume/entity/EmployCheckResume.java View File

@ -5,10 +5,12 @@ import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.modules.employResume.entity.EmployResume;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
@ -57,4 +59,8 @@ public class EmployCheckResume implements Serializable {
@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@ApiModelProperty(value = "关联用户id")
private java.lang.String userId;
//简历信息
@TableField(exist = false)
private EmployResume employResume;
}

+ 8
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionJob/entity/EmployCollectionJob.java View File

@ -5,10 +5,13 @@ import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.modules.employJob.entity.EmployJob;
import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
@ -57,4 +60,9 @@ public class EmployCollectionJob implements Serializable {
@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@ApiModelProperty(value = "关联用户id")
private java.lang.String userId;
//工作信息
@TableField(exist = false)
private EmployJob employJob;
}

+ 7
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employCollectionResume/entity/EmployCollectionResume.java View File

@ -5,10 +5,13 @@ import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.modules.employJob.entity.EmployJob;
import org.jeecg.modules.employResume.entity.EmployResume;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
@ -57,4 +60,8 @@ public class EmployCollectionResume implements Serializable {
@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@ApiModelProperty(value = "关联用户id")
private java.lang.String userId;
//简历信息
@TableField(exist = false)
private EmployResume employResume;
}

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/controller/EmployContractController.java View File

@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 电子合同表
* @Author: jeecg-boot
* @Date: 2024-10-24
* @Date: 2024-10-29
* @Version: V1.0
*/
@Api(tags="电子合同表")


+ 2
- 2
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/entity/EmployContract.java View File

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 电子合同表
* @Author: jeecg-boot
* @Date: 2024-10-24
* @Date: 2024-10-29
* @Version: V1.0
*/
@Data
@ -75,7 +75,7 @@ public class EmployContract implements Serializable {
@Excel(name = "关联招聘者id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@ApiModelProperty(value = "关联招聘者id")
private java.lang.String companyId;
private java.lang.String bossId;
/**关联求职者id*/
@Excel(name = "关联求职者id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/mapper/EmployContractMapper.java View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 电子合同表
* @Author: jeecg-boot
* @Date: 2024-10-24
* @Date: 2024-10-29
* @Version: V1.0
*/
public interface EmployContractMapper extends BaseMapper<EmployContract> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/IEmployContractService.java View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 电子合同表
* @Author: jeecg-boot
* @Date: 2024-10-24
* @Date: 2024-10-29
* @Version: V1.0
*/
public interface IEmployContractService extends IService<EmployContract> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/service/impl/EmployContractServiceImpl.java View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 电子合同表
* @Author: jeecg-boot
* @Date: 2024-10-24
* @Date: 2024-10-29
* @Version: V1.0
*/
@Service


+ 2
- 2
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/EmployContractList.vue View File

@ -156,7 +156,7 @@
{
title:'关联招聘者id',
align:"center",
dataIndex: 'companyId_dictText'
dataIndex: 'bossId_dictText'
},
{
title:'关联求职者id',
@ -203,7 +203,7 @@
fieldList.push({type:'string',value:'title',text:'合同标题',dictCode:''})
fieldList.push({type:'string',value:'nameA',text:'合同甲方名称',dictCode:''})
fieldList.push({type:'string',value:'nameB',text:'合同乙方名称',dictCode:''})
fieldList.push({type:'string',value:'companyId',text:'关联招聘者id',dictCode:"han_hai_member,nick_name,id"})
fieldList.push({type:'string',value:'bossId',text:'关联招聘者id',dictCode:"han_hai_member,nick_name,id"})
fieldList.push({type:'string',value:'personId',text:'关联求职者id',dictCode:"han_hai_member,nick_name,id"})
this.superFieldList = fieldList
}


+ 2
- 2
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue/modules/EmployContractForm.vue View File

@ -34,8 +34,8 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="关联招聘者id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyId">
<j-dict-select-tag type="list" v-model="model.companyId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联招聘者id" />
<a-form-model-item label="关联招聘者id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bossId">
<j-dict-select-tag type="list" v-model="model.bossId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联招聘者id" />
</a-form-model-item>
</a-col>
<a-col :span="24">


+ 2
- 2
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employContract/vue3/EmployContract.data.ts View File

@ -38,7 +38,7 @@ export const columns: BasicColumn[] = [
{
title: '关联招聘者id',
align:"center",
dataIndex: 'companyId_dictText'
dataIndex: 'bossId_dictText'
},
{
title: '关联求职者id',
@ -85,7 +85,7 @@ export const formSchema: FormSchema[] = [
},
{
label: '关联招聘者id',
field: 'companyId',
field: 'bossId',
component: 'JDictSelectTag',
componentProps:{
dictCode:"han_hai_member,nick_name,id"


+ 11
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java View File

@ -4,11 +4,16 @@ import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import java.util.List;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.modules.employJob.entity.EmployJob;
import org.jeecg.modules.employResume.entity.EmployResume;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
@ -197,4 +202,10 @@ public class HanHaiMember implements Serializable {
@Excel(name = "是否分销商", width = 15)
@ApiModelProperty(value = "是否分销商")
private java.lang.String isDai;
@TableField(exist = false)
List<EmployResume> employResumeList;
@TableField(exist = false)
List<EmployJob> employJobList;
}

+ 9
- 9
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/BossApiController.java View File

@ -73,14 +73,14 @@ public class BossApiController {
//会员中心-我的收藏
@ApiOperation(value="会员中心-我的收藏", notes="会员中心-我的收藏")
@RequestMapping(value = "/queryJobCollectionList", method = {RequestMethod.GET})
public Result<?> queryCollectionList(PageBean pageBean){
return bossApiService.queryJobCollectionList(pageBean);
public Result<?> queryCollectionList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
return bossApiService.queryJobCollectionList(token, pageBean);
}
//会员中心-联系记录-我看过谁(我的招工)
@ApiOperation(value="会员中心-联系记录-我看过谁", notes="会员中心-联系记录-我看过谁")
@RequestMapping(value = "/queryWatchWho", method = {RequestMethod.GET})
public Result<?> queryWatchWho(String token, PageBean pageBean){
public Result<?> queryWatchWho(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
return bossApiService.queryWatchWho(token, pageBean);
}
@ -91,25 +91,25 @@ public class BossApiController {
return bossApiService.queryWatchMe(token, pageBean);
}
//会员中心-联系记录-我看过谁(我的招工)
//会员中心-我的招工
@ApiOperation(value="会员中心-我的招工", notes="会员中心-我的招工")
@RequestMapping(value = "/queryJobListByUserId", method = {RequestMethod.GET})
public Result<?> queryJobListByUserId(String token, PageBean pageBean){
public Result<?> queryJobListByUserId(@RequestHeader("X-Access-Token")String token, PageBean pageBean){
return bossApiService.queryJobListByUserId(token, pageBean);
}
//我的服务-电子合同
@ApiOperation(value="电子合同-获取电子合同列表", notes="电子合同-获取电子合同列表")
@RequestMapping(value = "/queryContractList", method = {RequestMethod.GET})
public Result<?> queryContractList(EmployContract employContract, PageBean pageBean, HttpServletRequest req){
return bossApiService.queryContractList(employContract, pageBean, req);
public Result<?> queryContractList(@RequestHeader("X-Access-Token")String token, EmployContract employContract, PageBean pageBean){
return bossApiService.queryContractList(token, employContract, pageBean);
}
//我的服务-电子合同
@ApiOperation(value="电子合同-根据id查询电子合同详情", notes="电子合同-根据id查询电子合同详情")
@RequestMapping(value = "/queryContracById", method = {RequestMethod.GET})
public Result<?> queryContracById(String contractId){
return bossApiService.queryContracById(contractId);
public Result<?> queryContracById(@RequestHeader("X-Access-Token") String token, String contractId){
return bossApiService.queryContracById(token, contractId);
}


+ 8
- 8
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java View File

@ -139,8 +139,8 @@ public class CommonApiController {
//会员中心-积分记录
@ApiOperation(value="会员中心-积分记录", notes="type:0-收入 1-消耗")
@RequestMapping(value = "/queryScoreRecord", method = {RequestMethod.GET})
public Result<?> queryScoreRecord(@RequestHeader("X-Access-Token") String type, PageBean pageBean){
return commonApiService.queryScoreRecord(type, pageBean);
public Result<?> queryScoreRecord(@RequestHeader("X-Access-Token") String token, String type, PageBean pageBean){
return commonApiService.queryScoreRecord(token, type, pageBean);
}
//我的服务-获取VIP信息
@ -153,14 +153,14 @@ public class CommonApiController {
//我的服务-会员充值(开通VIP)
@ApiOperation(value="我的服务-会员充值(开通VIP)", notes="我的服务-会员充值(开通VIP)")
@RequestMapping(value = "/addRecharge", method = {RequestMethod.POST})
public Result<?> addVip(String token, EmployVipUser employVipUser){
public Result<?> addVip(@RequestHeader("X-Access-Token") String token, EmployVipUser employVipUser){
return commonApiService.addVip(token, employVipUser);
}
//我的服务-获取积分-充值积分
@ApiOperation(value="我的服务-获取积分-充值积分", notes="我的服务-获取积分-充值积分")
@RequestMapping(value = "/addScoreByRecharge", method = {RequestMethod.POST})
public Result<?> addScoreByRecharge(String token, String score, String type){
public Result<?> addScoreByRecharge(@RequestHeader("X-Access-Token") String token, String score, String type){
return commonApiService.addScoreByRecharge(token, score, type);
}
@ -174,15 +174,15 @@ public class CommonApiController {
//我的服务-个人实名认证
@ApiOperation(value="我的服务-个人实名认证", notes="我的服务-个人实名认证")
@RequestMapping(value = "/addAuthenticationPerson", method = {RequestMethod.POST})
public Result<?> addAuthenticationPerson(EmployAuthenticationPerson employAuthenticationPerson){
return commonApiService.addAuthenticationPerson(employAuthenticationPerson);
public Result<?> addAuthenticationPerson(@RequestHeader("X-Access-Token") String token, EmployAuthenticationPerson employAuthenticationPerson){
return commonApiService.addAuthenticationPerson(token, employAuthenticationPerson);
}
//我的服务-企业实名认证
@ApiOperation(value="我的服务-企业实名认证", notes="我的服务-企业实名认证")
@RequestMapping(value = "/addAuthenticationCompany", method = {RequestMethod.POST})
public Result<?> addAuthenticationCompany(EmployAhthenticationCompany employAhthenticationCompany){
return commonApiService.addAuthenticationCompany(employAhthenticationCompany);
public Result<?> addAuthenticationCompany(@RequestHeader("X-Access-Token") String token, EmployAhthenticationCompany employAhthenticationCompany){
return commonApiService.addAuthenticationCompany(token, employAhthenticationCompany);
}
//
// //我的服务-兑换码


+ 3
- 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/EmployeeApiController.java View File

@ -6,6 +6,7 @@ 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.employContract.entity.EmployContract;
import org.jeecg.modules.employJob.entity.EmployJob;
import org.jeecg.modules.employRedister.entity.EmployRedister;
import org.jeecg.modules.employResume.entity.EmployResume;
@ -104,8 +105,8 @@ public class EmployeeApiController {
//我的服务-电子合同
@ApiOperation(value="电子合同-获取电子合同列表", notes="电子合同-获取电子合同列表")
@RequestMapping(value = "/queryContractList", method = {RequestMethod.GET})
public Result<?> queryContractList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
return employeeApiService.queryContractList(token, pageBean);
public Result<?> queryContractList(@RequestHeader("X-Access-Token") String token, EmployContract employContract, PageBean pageBean){
return employeeApiService.queryContractList(token, employContract, pageBean);
}
//我的服务-电子合同


+ 3
- 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/BossApiService.java View File

@ -23,7 +23,7 @@ public interface BossApiService {
/***************会员中心***************/
//会员中心-我的收藏
public Result<?> queryJobCollectionList(PageBean pageBean);
public Result<?> queryJobCollectionList(String token, PageBean pageBean);
//会员中心-联系记录-我看过谁
public Result<?> queryWatchWho(String token, PageBean pageBean);
@ -35,9 +35,9 @@ public interface BossApiService {
public Result<?> queryJobListByUserId(String token, PageBean pageBean);
//电子合同-获取电子合同列表
public Result<?> queryContractList(EmployContract employContract, PageBean pageBean, HttpServletRequest req);
public Result<?> queryContractList(String token, EmployContract employContract, PageBean pageBean);
//电子合同-获取电子合同详情
public Result<?> queryContracById(String contractId);
public Result<?> queryContracById(String token, String contractId);
}

+ 3
- 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CommonApiService.java View File

@ -47,7 +47,7 @@ public interface CommonApiService {
public Result<?> queryScore(String token);
//会员中心-积分记录
public Result<?> queryScoreRecord(String type, PageBean pageBean);
public Result<?> queryScoreRecord(String token, String type, PageBean pageBean);
//会员中心-获取VIP配置信息
public Result<?> queryVipType(PageBean pageBean);
@ -59,10 +59,10 @@ public interface CommonApiService {
public Result<?> addScoreByRecharge(String token, String score, String type);
//会员中心-实名认证
public Result<?> addAuthenticationPerson(EmployAuthenticationPerson employAuthenticationPerson);
public Result<?> addAuthenticationPerson(String token, EmployAuthenticationPerson employAuthenticationPerson);
//会员中心-企业
public Result<?> addAuthenticationCompany(EmployAhthenticationCompany employAhthenticationCompany);
public Result<?> addAuthenticationCompany(String token, EmployAhthenticationCompany employAhthenticationCompany);


+ 2
- 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/EmployeeApiService.java View File

@ -2,6 +2,7 @@ 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.employRedister.entity.EmployRedister;
@ -42,7 +43,7 @@ public interface EmployeeApiService {
public Result<?> queryResumeByUserId(String token, PageBean pageBean);
//电子合同-获取电子合同列表
public Result<?> queryContractList(String token, PageBean pageBean);
public Result<?> queryContractList(String token, EmployContract employContract, PageBean pageBean);
//电子合同-获取电子合同详情
public Result<?> queryContracById(String token, String contractId);


+ 71
- 62
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BossApiServiceImpl.java View File

@ -2,6 +2,7 @@ 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.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
@ -143,25 +144,26 @@ public class BossApiServiceImpl implements BossApiService {
/***************会员中心***************/
//会员中心-我的收藏
@Override
public Result<?> queryJobCollectionList(PageBean pageBean) {
public Result<?> queryJobCollectionList(String token, PageBean pageBean) {
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
Page<EmployCollectionResume> page = new Page<EmployCollectionResume>(pageBean.getPageNo(), pageBean.getPageSize());
//获取收藏列表
Page<EmployCollectionResume> pageList = employCollectionResumeService
.lambdaQuery()
.eq(EmployCollectionResume::getUserId, hanHaiMember.getId())
.page(page);
List<ResumeCollectionBean> list = new ArrayList<>();
//根据收藏列表关联简历id获取简历信息
for (EmployCollectionResume record : pageList.getRecords()) {
ResumeCollectionBean resumeCollectionBean = new ResumeCollectionBean();
EmployResume one = employResumeService.getById(record.getResumeId());
resumeCollectionBean.setEmployCollectionResume(record);
resumeCollectionBean.setEmployResume(one);
list.add(resumeCollectionBean);
//获取简历信息
EmployResume resume = employResumeService.getById(record.getResumeId());
//将简历信息添加到我的收藏中
record.setEmployResume(resume);
}
return Result.OK("简历收藏列表", list);
return Result.OK("简历收藏列表", pageList);
}
//会员中心-联系记录-我看过谁
@ -177,13 +179,15 @@ public class BossApiServiceImpl implements BossApiService {
.eq(EmployCheckResume::getUserId, hanHaiMember.getId())
.page(page);
List<EmployResume> resumeList = new ArrayList<>();
//根据查看记录关联简历id获取简历信息
for (EmployCheckResume record : pageList.getRecords()) {
//获取简历信息
EmployResume employResume = employResumeService.getById(record.getResumeId());
resumeList.add(employResume);
//将简历信息添加到查看记录中
record.setEmployResume(employResume);
}
return Result.OK("我看过谁", resumeList);
return Result.OK("我看过谁", pageList);
}
//会员中心-联系记录-谁看过我(谁看过我的招工)
@ -192,73 +196,74 @@ public class BossApiServiceImpl implements BossApiService {
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
//查询我发布的工作
//查询我发布的工作列表
List<EmployJob> jobList = employJobService
.lambdaQuery()
.eq(EmployJob::getUserId, hanHaiMember.getId())
.eq(EmployJob::getUserId, "1848653506820112385")
.list();
//获取工作被查询的记录
List<EmployCheckJob> lists = new ArrayList<>();
//获取查看我发布的工作id列表
int jobSize = (int)jobList.size();
Object[] jobIds = new Object[jobSize];
int jobIndex = 0;
for (EmployJob job : jobList) {
List<EmployCheckJob> checkJobList1 = employCheckJobService
.lambdaQuery()
.eq(EmployCheckJob::getJobId, job.getId())
.list();
lists.addAll(checkJobList1);
jobIds[jobIndex] = job.getId();
jobIndex++;
}
if(jobSize == 0){
return Result.OK("您还没有发布过招工", jobList);
}
//获取工作被查询的记录
List<EmployCheckJob> checkJobList = employCheckJobService
.lambdaQuery()
.in(EmployCheckJob::getJobId, jobIds)
.list();
//获取查看我的工作的求职者id
int size = (int)lists.size();
Object[] objects = new Object[size];
int size = (int)checkJobList.size();
Object[] employeeIds = new Object[size];
int index = 0;
for (EmployCheckJob employCheckJob : lists) {
objects[index] = employCheckJob.getUserId();
for (EmployCheckJob employCheckJob : checkJobList) {
employeeIds[index] = employCheckJob.getUserId();
index++;
}
if(index == 0){
return Result.OK("没有人看过我的招工", lists);
if(size == 0){
return Result.OK("没有人看过我的招工", checkJobList);
}
//根据求职者id查询求职者基本信息
List<HanHaiMember> hanHaiMemberList = hanHaiMemberService
Page<HanHaiMember> page = new Page<HanHaiMember>(pageBean.getPageNo(), pageBean.getPageSize());
Page<HanHaiMember> hanHaiMemberList = hanHaiMemberService
.lambdaQuery()
.in(HanHaiMember::getId, objects)
.list();
.in(HanHaiMember::getId, employeeIds)
.page(page);
//根据求职者id查询求职者简历
// Page<EmployResume> page = new Page<EmployResume>(pageBean.getPageNo(), pageBean.getPageSize());
// Page<EmployResume> pageList = employResumeService
// .lambdaQuery()
// .in(EmployResume::getUserId,objects)
// .page(page);
List<WatchMeBean> watchMeBeanList = new ArrayList<>();
for (HanHaiMember haiMember : hanHaiMemberList) {
WatchMeBean watchMeBean = new WatchMeBean();
for (HanHaiMember record : hanHaiMemberList.getRecords()) {
List<EmployResume> employResumeList = employResumeService
.lambdaQuery()
.eq(EmployResume::getUserId, haiMember.getId())
.eq(EmployResume::getUserId, record.getId())
.list();
watchMeBean.setHanHaiMember(haiMember);
watchMeBean.setEmployResumeList(employResumeList);
watchMeBeanList.add(watchMeBean);
record.setEmployResumeList(employResumeList);
}
return Result.OK("谁看过我(谁看过我的招工)列表", watchMeBeanList);
return Result.OK("谁看过我(谁看过我的招工)列表", hanHaiMemberList);
}
//我的招工
@Override
public Result<?> queryJobListByUserId(String token, PageBean pageBean) {
//权限验证
//HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
Page<EmployJob> page = new Page<EmployJob>(pageBean.getPageNo(), pageBean.getPageSize());
Page<EmployJob> pageList = employJobService
.lambdaQuery()
//.eq(EmployCheckResume::getUserId, hanHaiMember.getId())
.eq(EmployJob::getUserId, hanHaiMember.getId())
.page(page);
return Result.OK("我的招工", pageList);
@ -266,36 +271,40 @@ public class BossApiServiceImpl implements BossApiService {
//电子合同-获取电子合同列表
@Override
public Result<?> queryContractList(EmployContract employContract, PageBean pageBean, HttpServletRequest req) {
public Result<?> queryContractList(String token, EmployContract employContract, PageBean pageBean) {
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
//分页
Page<EmployContract> page = new Page<EmployContract>(pageBean.getPageNo(), pageBean.getPageSize());
LambdaQueryChainWrapper<EmployContract> query = employContractService
.lambdaQuery()
.eq(EmployContract::getBossId, hanHaiMember.getId());
// 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);
//组装查询条件
if(null != employContract.getSignCompany()){
query.like(EmployContract::getSignCompany, employContract.getSignCompany());
}
if(null != employContract.getSignPerson()){
query.like(EmployContract::getSignPerson, employContract.getSignPerson());
}
// //权限验证
// HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
// employContract.setCompanyId(hanHaiMember.getId());
//获取电子合同信息
Page<EmployContract> pageList = query.page(page);
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 contractId) {
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::getBossId, hanHaiMember.getId())
.eq(EmployContract::getId, contractId)
.one();


+ 33
- 51
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java View File

@ -1,5 +1,6 @@
package org.jeecg.modules.apiService.impl;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.common.api.vo.Result;
import org.jeecg.config.shiro.ShiroRealm;
@ -250,29 +251,32 @@ public class CommonApiServiceImpl implements CommonApiService {
public Result<?> queryScore(String token) {
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
//积分信息
ScoreBean scoreBean = new ScoreBean();
//正式积分
EmployScore one = employScoreService
EmployScore formalScore = employScoreService
.lambdaQuery()
.eq(EmployScore::getUserId, hanHaiMember.getId())
.eq(EmployScore::getType, "0")
.one();
EmployScore two = employScoreService
//临时积分
EmployScore tempScore = employScoreService
.lambdaQuery()
.eq(EmployScore::getUserId, hanHaiMember.getId())
.eq(EmployScore::getType, "1")
.one();
double three = 0;
if(null != one && null != two){
three = one.getScore() + two.getScore();
}else if(null != one){
three = one.getScore();
}else if(null != two){
three = two.getScore();
//当前积分
double currentScore = 0;
if(null != formalScore && null != tempScore){
currentScore = formalScore.getScore() + tempScore.getScore();
}else if(null != formalScore){
currentScore = formalScore.getScore();
}else if(null != tempScore){
currentScore = tempScore.getScore();
}else {
scoreBean.setFormalScore(0);
scoreBean.setTempScore(0);
@ -280,31 +284,32 @@ public class CommonApiServiceImpl implements CommonApiService {
return Result.OK("积分信息", scoreBean);
}
scoreBean.setFormalScore(one.getScore());
scoreBean.setTempScore(two.getScore());
scoreBean.setCurrentScore(three);
scoreBean.setFormalScore(formalScore.getScore());
scoreBean.setTempScore(tempScore.getScore());
scoreBean.setCurrentScore(currentScore);
return Result.OK("积分信息", scoreBean);
}
//会员中心-积分记录
@Override
public Result<?> queryScoreRecord(String type, PageBean pageBean) {
public Result<?> queryScoreRecord(String token, String type, PageBean pageBean) {
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
//分页
Page<EmployScoreRecord> page = new Page<EmployScoreRecord>(pageBean.getPageNo(), pageBean.getPageSize());
Page<EmployScoreRecord> pageList =null;
LambdaQueryChainWrapper<EmployScoreRecord> query = employScoreRecordService.lambdaQuery();
//组装查询条件
query.eq(EmployScoreRecord::getUserId, hanHaiMember.getId());
if(null != type){
pageList = employScoreRecordService
.lambdaQuery()
.eq(EmployScoreRecord::getType, type)
.page(page);
}else {
pageList = employScoreRecordService
.lambdaQuery()
.page(page);
query.eq(EmployScoreRecord::getType, type);
}
//获取积分记录
Page<EmployScoreRecord> pageList = query.page(page);
return Result.OK("积分记录", pageList);
}
@ -352,12 +357,12 @@ public class CommonApiServiceImpl implements CommonApiService {
//会员中心-个人实名认证
@Override
public Result<?> addAuthenticationPerson(EmployAuthenticationPerson employAuthenticationPerson) {
public Result<?> addAuthenticationPerson(String token, EmployAuthenticationPerson employAuthenticationPerson) {
String message = "";
//权限验证
//HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
//employFeedback.setUserId(hanHaiMember.getId());
employAuthenticationPerson.setUserId(hanHaiMember.getId());
boolean result = employAuthenticationPersonService.save(employAuthenticationPerson);
if(result){
@ -371,12 +376,12 @@ public class CommonApiServiceImpl implements CommonApiService {
//会员中心-企业实名认证
@Override
public Result<?> addAuthenticationCompany(EmployAhthenticationCompany employAhthenticationCompany) {
public Result<?> addAuthenticationCompany(String token, EmployAhthenticationCompany employAhthenticationCompany) {
String message = "";
//权限验证
//HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
//employFeedback.setUserId(hanHaiMember.getId());
employAhthenticationCompany.setUserId(hanHaiMember.getId());
boolean result = employAhthenticationCompanyService.save(employAhthenticationCompany);
if(result){
@ -388,27 +393,4 @@ public class CommonApiServiceImpl implements CommonApiService {
return Result.OK(message);
}
// //个人记工-在建项目
// @Override
// public Result<?> queryStrartJobList(PageBean pageBean) {
// Page<EmployNotebook> page = new Page<EmployNotebook>(pageBean.getPageNo(), pageBean.getPageSize());
// Page<EmployNotebook> pageList = employNotebookService
// .lambdaQuery()
// .eq(EmployNotebook::getStatus, 0)
// .page(page);
//
// return Result.OK("在建项目", pageList);
// }
//
// //个人记工-结束项目
// @Override
// public Result<?> queryEndJobList(PageBean pageBean) {
// Page<EmployNotebook> page = new Page<EmployNotebook>(pageBean.getPageNo(), pageBean.getPageSize());
// Page<EmployNotebook> pageList = employNotebookService
// .lambdaQuery()
// .eq(EmployNotebook::getStatus, 1)
// .page(page);
//
// return Result.OK("结束项目", pageList);
// }
}

+ 67
- 51
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/EmployeeApiServiceImpl.java View File

@ -1,6 +1,7 @@
package org.jeecg.modules.apiService.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.poi.hslf.blip.EMF;
import org.jeecg.common.api.vo.Result;
@ -180,28 +181,25 @@ public class EmployeeApiServiceImpl implements EmployeeApiService {
@Override
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查询工作信息
List<JobCollectionBean> list = new ArrayList<>();
for (EmployCollectionJob record : pageList.getRecords()) {
JobCollectionBean jobCollectionBean = new JobCollectionBean();
EmployJob one = employJobService.getById(record.getJobId());
jobCollectionBean.setEmployCollectionJob(record);
jobCollectionBean.setEmployJob(one);
list.add(jobCollectionBean);
//获取工作信息
EmployJob job = employJobService.getById(record.getJobId());
//将工作信息添加至收藏列表
record.setEmployJob(job);
}
return Result.OK("工作收藏列表", list);
return Result.OK("工作收藏列表", pageList);
}
//会员中心-联系记录-我看过谁
@ -210,82 +208,86 @@ public class EmployeeApiServiceImpl implements EmployeeApiService {
//权限验证
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())
.page(page);
List<EmployJob> jobList = new ArrayList<>();
//添加工作信息
for (EmployCheckJob record : pageList.getRecords()) {
//获取工作信息
EmployJob employJob = employJobService.getById(record.getJobId());
jobList.add(employJob);
//添加工作信息
record.setEmployJob(employJob);
}
return Result.OK("我看过谁", jobList);
return Result.OK("我看过谁", pageList);
}
//会员中心-联系记录-谁看过我(谁看过我的简历)
@Override
public Result<?> queryWatchMe(String token, PageBean pageBean) {
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
//查询我的简历
List<EmployResume> list = employResumeService
//查询我发布的简历列表
List<EmployResume> resumeList = employResumeService
.lambdaQuery()
.eq(EmployResume::getUserId, hanHaiMember.getId())
.list();
//查询我的简历被查看的记录
List<EmployCheckResume> list1 = new ArrayList<>();
for (EmployResume employResume : list) {
List<EmployCheckResume> list2 = employCheckResumeService
//获取查看我发布的简历id列表
int resumeSize = (int)resumeList.size();
Object[] resumeIds = new Object[resumeSize];
int jobIndex = 0;
for (EmployResume resume : resumeList) {
resumeIds[jobIndex] = resume.getId();
jobIndex++;
}
if(resumeSize == 0){
return Result.OK("您还没有发布过简历", resumeList);
}
//获取简历被查询的记录
List<EmployCheckResume> checkResumeList = employCheckResumeService
.lambdaQuery()
.eq(EmployCheckResume::getResumeId, employResume.getId())
.in(EmployCheckResume::getResumeId, resumeIds)
.list();
list1.addAll(list2);
}
//获取查看我的简历的招聘人员id
int size = (int)list1.size();
Object[] objects = new Object[size];
//获取查看我的简历的招聘者id
int size = (int)checkResumeList.size();
Object[] bossIds = new Object[size];
int index = 0;
for (EmployCheckResume employCheckResume : list1) {
objects[index] = employCheckResume.getUserId();
for (EmployCheckResume employCheckResume : checkResumeList) {
bossIds[index] = employCheckResume.getUserId();
index++;
}
if(index == 0){
return Result.OK("没有人看过我的简历", list1);
if(size == 0){
return Result.OK("没有人看过我的简历", checkResumeList);
}
//根据招聘人员id查询招聘人员基本信息
List<HanHaiMember> hanHaiMemberList = hanHaiMemberService
//根据招聘者id查询招聘者基本信息
Page<HanHaiMember> page = new Page<HanHaiMember>(pageBean.getPageNo(), pageBean.getPageSize());
Page<HanHaiMember> hanHaiMemberList = hanHaiMemberService
.lambdaQuery()
.in(HanHaiMember::getId, objects)
.list();
.in(HanHaiMember::getId, bossIds)
.page(page);
//根据招聘人员id查询发布的工作岗位
// Page<EmployJob> page = new Page<EmployJob>(pageBean.getPageNo(), pageBean.getPageSize());
// Page<EmployJob> pageList = employJobService
// .lambdaQuery()
// .in(EmployJob::getUserId,objects)
// .page(page);
List<WatchMeBean> watchMeBeanList = new ArrayList<>();
for (HanHaiMember haiMember : hanHaiMemberList) {
WatchMeBean watchMeBean = new WatchMeBean();
//根据招聘者id查询招聘者发布的工作
for (HanHaiMember record : hanHaiMemberList.getRecords()) {
List<EmployJob> employJobList = employJobService
.lambdaQuery()
.eq(EmployJob::getUserId, haiMember.getId())
.eq(EmployJob::getUserId, record.getId())
.list();
watchMeBean.setHanHaiMember(haiMember);
watchMeBean.setEmployJobList(employJobList);
watchMeBeanList.add(watchMeBean);
record.setEmployJobList(employJobList);
}
return Result.OK("谁看过我的简历", watchMeBeanList);
return Result.OK("谁看过我(谁看过我的简历)", hanHaiMemberList);
}
//会员中心-我的找活
@ -305,17 +307,30 @@ public class EmployeeApiServiceImpl implements EmployeeApiService {
//电子合同-获取电子合同列表
@Override
public Result<?> queryContractList(String token, PageBean pageBean) {
public Result<?> queryContractList(String token, EmployContract employContract, PageBean pageBean) {
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
//分页
Page<EmployContract> page = new Page<EmployContract>(pageBean.getPageNo(), pageBean.getPageSize());
Page<EmployContract> pageList = employContractService
LambdaQueryChainWrapper<EmployContract> query = employContractService
.lambdaQuery()
.eq(EmployContract::getPersonId, hanHaiMember.getId())
.page(page);
.eq(EmployContract::getPersonId, hanHaiMember.getId());
//组装查询条件
if(null != employContract.getSignCompany()){
query.like(EmployContract::getSignCompany, employContract.getSignCompany());
}
if(null != employContract.getSignPerson()){
query.like(EmployContract::getSignPerson, employContract.getSignPerson());
}
//获取电子合同信息
Page<EmployContract> pageList = query.page(page);
return Result.OK("电子合同列表", pageList);
}
//电子合同-获取电子合同详情
@ -327,6 +342,7 @@ public class EmployeeApiServiceImpl implements EmployeeApiService {
EmployContract one = employContractService
.lambdaQuery()
.eq(EmployContract::getId, contractId)
.eq(EmployContract::getPersonId, hanHaiMember.getId())
.one();
return Result.OK("电子合同详情", one);


Loading…
Cancel
Save