diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employSeek/entity/EmploySeek.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employSeek/entity/EmploySeek.java index 1e1e4f2..541b414 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employSeek/entity/EmploySeek.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employSeek/entity/EmploySeek.java @@ -4,6 +4,8 @@ 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; @@ -118,5 +120,5 @@ public class EmploySeek implements Serializable { @TableField(exist = false) private EmployResume employResume; @TableField(exist = false) - private EmployOrder employOrder; + private List employOrder; } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java index 34b8a19..b25fdf6 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java @@ -327,6 +327,9 @@ public class OrderServiceImpl implements OrderService { if (employSeek==null){ return Result.error("求职订单不存在"); } + if (employSeek.getSeekStatus() != 0){ + return Result.error("求职订单已被聘用"); + } //获取发布人用户标识 String toUser = employSeek.getUserId(); //根据发布人用户标识查询用户的简历信息 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/SeekServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/SeekServiceImpl.java index ad6af53..e29f00c 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/SeekServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/SeekServiceImpl.java @@ -57,6 +57,7 @@ public class SeekServiceImpl implements SeekService { Page pageList = employSeekService.lambdaQuery() .like(employSeek.getAddress() != null, EmploySeek::getAddress, employSeek.getAddress()) .orderByDesc(EmploySeek::getCreateTime) + .notIn(EmploySeek::getSeekStatus, 1, 2) .page(page); //创建一个新的集合 for (EmploySeek seek : pageList.getRecords()) { @@ -76,6 +77,16 @@ public class SeekServiceImpl implements SeekService { one.setCategoryOne(employCategoryService.getById(one.getCategoryOne()).getName()); one.setCategoryTwo(employCategoryService.getById(one.getCategoryTwo()).getName()); + List list = employOrderService.lambdaQuery() + .orderByDesc(EmployOrder::getStatus, EmployOrder::getCreateTime) + .eq(EmployOrder::getSeekId, one.getId()).list(); + + for (EmployOrder employOrder : list) { + employOrder.setEmployAuthenticationCompany(employAuthenticationCompanyService.getById(employOrder.getCompanyId())); + } + + one.setEmployOrder(list); + return Result.OK("求职信息查询成功", one); } //求职信息-添加求职信息 @@ -136,8 +147,12 @@ public class SeekServiceImpl implements SeekService { for (EmploySeek seek : pageList.getRecords()) { seek.setHanHaiMember(hanHaiMemberService.getById(seek.getUserId())); seek.setEmployResume(employResumeService.getById(seek.getResumeId())); - EmployOrder one = employOrderService.lambdaQuery().eq(EmployOrder::getSeekId, seek.getId()).one(); - seek.setEmployOrder(one); + + List list = employOrderService.lambdaQuery() + .orderByDesc(EmployOrder::getStatus, EmployOrder::getCreateTime) + .eq(EmployOrder::getSeekId, seek.getId()).list(); + seek.setEmployOrder(list); + } return Result.OK("求职信息查询成功", pageList); }