diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java index 6dff872..e20e0d0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java @@ -39,6 +39,7 @@ import com.ruoyi.wgz.domain.WgzUser; import com.ruoyi.wgz.service.IWgzMessageService; import com.ruoyi.wgz.service.IWgzScoreRecordService; import com.ruoyi.wgz.service.IWgzUserService; +import com.ruoyi.wgz.service.impl.WgzMessageServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; @@ -255,13 +256,16 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl 0) { - throw new RuntimeException("已有工地!不可再次申请!"); - } WgzUser byId = wgzUserService.findByUserId(appUserId); if (byId == null) { throw new RuntimeException("查询不到用户信息!"); } + if (byId.getIdentityCard() == null || byId.getIdentityCard()=="") { + throw new RuntimeException("当前用户还未实名认证!"); + } + if (i > 0) { + throw new RuntimeException("已有工地!不可再次申请!"); + } List list = Arrays.asList(byId.getTypeOfWork().split(",")); if (!list.contains(appById.getTypeOfWork())){ throw new RuntimeException("工种不匹配!"); @@ -469,6 +473,14 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl annex; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzMessageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzMessageMapper.java index e449893..b5a53e0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzMessageMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzMessageMapper.java @@ -1,6 +1,7 @@ package com.ruoyi.wgz.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.bgt.domain.BgtProjectRecruit; import com.ruoyi.bgt.domain.dto.BgtDailyClockListDTO; import com.ruoyi.bgt.domain.vo.BgtDailyClockListVO; import com.ruoyi.wgz.bo.req.WgzAppGetMessageListReq; @@ -11,6 +12,7 @@ import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache; import org.apache.ibatis.annotations.CacheNamespace; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -32,4 +34,7 @@ public interface WgzMessageMapper extends BaseMapperPlus { //分页查询消息列表 Page pagingQueryTheMessageList(@Param("page") Page page,@Param("req") WgzAppGetMessageListReq req); + + @Select("SELECT count(1) FROM bgt_project_recruit_apply WHERE recruit_id = #{recruitId} and status in ('3','4')") + int countRecruitApply(Long recruitId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java index 8117926..8fc3f1a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java @@ -225,7 +225,7 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl byUserIdAndRecruitId = annexService.findByUserIdAndRecruitId(appUserId, byId.getId(), new String[]{"1"}); -// byRecruitIdData.setAnnex(null); - return byRecruitIdData.setMessageId(byId.getId()).setIsOperation(byId.getIsOperation()); + byRecruitIdData.setMessageId(byId.getId()).setIsOperation(byId.getIsOperation()); + byRecruitIdData.setFull(JudgingRecruitment(byId.getTableId(), byRecruitIdData.getRecruitStaffNum(), byRecruitIdData.getRecruitEndTime())); + return byRecruitIdData; } @Override @@ -217,4 +219,29 @@ public class WgzMessageServiceImpl extends ServicePlusImpl 0; } + + + /** + * 判断招工是否已招满或已过期 + * @param recruitId 招工ID + * @param num 招工数量 + * @param recruitEndTime 招工结束时间 + * @return + */ + public String JudgingRecruitment(Long recruitId,int num,LocalDate recruitEndTime) { + //使用数据库行级锁 + int count = baseMapper.countRecruitApply(recruitId); +// int count = iBgtProjectRecruitApplyService.count( +// Wrappers.lambdaQuery() +// .eq(BgtProjectRecruitApply::getRecruitId, recruitId) +// .in(BgtProjectRecruitApply::getStatus, Arrays.asList("3", "4")) +// ); + if(count == num){ + return "1"; + } + if (recruitEndTime.isAfter(LocalDate.now())){ + return "2"; + } + return "0"; + } } diff --git a/ruoyi-system/src/main/resources/mapper/wgz/WgzMessageMapper.xml b/ruoyi-system/src/main/resources/mapper/wgz/WgzMessageMapper.xml index d2ebfe9..ff11255 100644 --- a/ruoyi-system/src/main/resources/mapper/wgz/WgzMessageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wgz/WgzMessageMapper.xml @@ -100,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND a.message_small_type = #{req.smallType} + order by a.create_time desc @@ -123,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.message_small_type is null AND a.del_flag = "0" + order by a.create_time desc @@ -136,6 +138,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" b.recruit_amount as recruitAmount, b.recruit_staff_num as recruitStaffNum, b.sub_describe as subDescribe, + b.recruit_begin_time as recruitBeginTime, + b.recruit_end_time as recruitEndTime, b.recruit_work_begin_time as recruitWorkBeginTime, b.recruit_contact_person as recruitContactPerson, b.recruit_contact_phone as recruitContactPhone, diff --git a/ruoyi/uploadPath/upload/2025/03/05/26ced426-b400-4ab3-a2d2-30b22714a34a.jpg b/ruoyi/uploadPath/upload/2025/03/05/26ced426-b400-4ab3-a2d2-30b22714a34a.jpg new file mode 100644 index 0000000..7e44149 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/05/26ced426-b400-4ab3-a2d2-30b22714a34a.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/05/543ec0c2-6a6d-4192-bb15-8f0d9c930995.jpg b/ruoyi/uploadPath/upload/2025/03/05/543ec0c2-6a6d-4192-bb15-8f0d9c930995.jpg new file mode 100644 index 0000000..5c8b024 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/05/543ec0c2-6a6d-4192-bb15-8f0d9c930995.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/05/5b36f50a-36df-4071-a364-03b4cc50fb47.jpg b/ruoyi/uploadPath/upload/2025/03/05/5b36f50a-36df-4071-a364-03b4cc50fb47.jpg new file mode 100644 index 0000000..7e44149 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/05/5b36f50a-36df-4071-a364-03b4cc50fb47.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/05/6581e08b-cf7b-4210-bfd8-43c85a0756b0.jpg b/ruoyi/uploadPath/upload/2025/03/05/6581e08b-cf7b-4210-bfd8-43c85a0756b0.jpg new file mode 100644 index 0000000..62cd306 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/05/6581e08b-cf7b-4210-bfd8-43c85a0756b0.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/05/6cb4c027-cfc1-49a3-bd90-f470089c3ca6.jpg b/ruoyi/uploadPath/upload/2025/03/05/6cb4c027-cfc1-49a3-bd90-f470089c3ca6.jpg new file mode 100644 index 0000000..957f357 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/05/6cb4c027-cfc1-49a3-bd90-f470089c3ca6.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/05/7675ddc0-4e52-4a69-8649-09970884bf03.jpg b/ruoyi/uploadPath/upload/2025/03/05/7675ddc0-4e52-4a69-8649-09970884bf03.jpg new file mode 100644 index 0000000..5c8b024 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/05/7675ddc0-4e52-4a69-8649-09970884bf03.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/05/7b7eecb1-bb27-4451-b7d5-53ea2467a4f2.jpg b/ruoyi/uploadPath/upload/2025/03/05/7b7eecb1-bb27-4451-b7d5-53ea2467a4f2.jpg new file mode 100644 index 0000000..7e44149 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/05/7b7eecb1-bb27-4451-b7d5-53ea2467a4f2.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/05/852318f1-9415-44da-a708-21b722594fc6.jpg b/ruoyi/uploadPath/upload/2025/03/05/852318f1-9415-44da-a708-21b722594fc6.jpg new file mode 100644 index 0000000..7e44149 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/05/852318f1-9415-44da-a708-21b722594fc6.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/05/8ce5bcaf-a9fd-442b-9233-0fd30d2da6b0.jpg b/ruoyi/uploadPath/upload/2025/03/05/8ce5bcaf-a9fd-442b-9233-0fd30d2da6b0.jpg new file mode 100644 index 0000000..7e44149 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/05/8ce5bcaf-a9fd-442b-9233-0fd30d2da6b0.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/05/9a67972a-b4b9-4c1a-b1ad-a8f0f7435975.jpg b/ruoyi/uploadPath/upload/2025/03/05/9a67972a-b4b9-4c1a-b1ad-a8f0f7435975.jpg new file mode 100644 index 0000000..7e44149 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/05/9a67972a-b4b9-4c1a-b1ad-a8f0f7435975.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/05/ac9f0462-0daf-4a6c-b923-b508afc31913.jpg b/ruoyi/uploadPath/upload/2025/03/05/ac9f0462-0daf-4a6c-b923-b508afc31913.jpg new file mode 100644 index 0000000..957f357 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/05/ac9f0462-0daf-4a6c-b923-b508afc31913.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/05/f2349e16-1baf-4b9f-81f2-a42af5625a2a.jpg b/ruoyi/uploadPath/upload/2025/03/05/f2349e16-1baf-4b9f-81f2-a42af5625a2a.jpg new file mode 100644 index 0000000..7e44149 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/05/f2349e16-1baf-4b9f-81f2-a42af5625a2a.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/06/021e6ff6-1301-40a3-8287-3c8fd40ff574.jpg b/ruoyi/uploadPath/upload/2025/03/06/021e6ff6-1301-40a3-8287-3c8fd40ff574.jpg new file mode 100644 index 0000000..a495c86 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/06/021e6ff6-1301-40a3-8287-3c8fd40ff574.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/06/044e6f45-cf85-4330-b6a0-c8cb817573fb.jpg b/ruoyi/uploadPath/upload/2025/03/06/044e6f45-cf85-4330-b6a0-c8cb817573fb.jpg new file mode 100644 index 0000000..5974f29 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/06/044e6f45-cf85-4330-b6a0-c8cb817573fb.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/06/07147692-40a5-485b-b8fc-728a6afe20b7.jpg b/ruoyi/uploadPath/upload/2025/03/06/07147692-40a5-485b-b8fc-728a6afe20b7.jpg new file mode 100644 index 0000000..957f357 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/06/07147692-40a5-485b-b8fc-728a6afe20b7.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/06/07ad4e18-e857-44b3-90ab-7a2e02cc6348.jpg b/ruoyi/uploadPath/upload/2025/03/06/07ad4e18-e857-44b3-90ab-7a2e02cc6348.jpg new file mode 100644 index 0000000..1e22975 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/06/07ad4e18-e857-44b3-90ab-7a2e02cc6348.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/06/14eb0f4e-2fe0-4a8f-bb7b-0bd1993c89aa.jpg b/ruoyi/uploadPath/upload/2025/03/06/14eb0f4e-2fe0-4a8f-bb7b-0bd1993c89aa.jpg new file mode 100644 index 0000000..1e22975 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/06/14eb0f4e-2fe0-4a8f-bb7b-0bd1993c89aa.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/06/1ca860dc-8784-4f1d-804a-d7d250b4d2eb.jpg b/ruoyi/uploadPath/upload/2025/03/06/1ca860dc-8784-4f1d-804a-d7d250b4d2eb.jpg new file mode 100644 index 0000000..957f357 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/06/1ca860dc-8784-4f1d-804a-d7d250b4d2eb.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/06/22702f9c-0659-4c7a-ab48-5abc106268c4.jpg b/ruoyi/uploadPath/upload/2025/03/06/22702f9c-0659-4c7a-ab48-5abc106268c4.jpg new file mode 100644 index 0000000..a495c86 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/06/22702f9c-0659-4c7a-ab48-5abc106268c4.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/06/3a8e774d-3912-4c5b-88bf-2fe0040500cd.jpg b/ruoyi/uploadPath/upload/2025/03/06/3a8e774d-3912-4c5b-88bf-2fe0040500cd.jpg new file mode 100644 index 0000000..957f357 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/06/3a8e774d-3912-4c5b-88bf-2fe0040500cd.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/06/4f19fee2-dd29-47af-9411-aa7cde6fdb4f.jpg b/ruoyi/uploadPath/upload/2025/03/06/4f19fee2-dd29-47af-9411-aa7cde6fdb4f.jpg new file mode 100644 index 0000000..e3c465f Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/06/4f19fee2-dd29-47af-9411-aa7cde6fdb4f.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/06/81b35169-9b54-419d-8a45-ff3d9021dba4.jpg b/ruoyi/uploadPath/upload/2025/03/06/81b35169-9b54-419d-8a45-ff3d9021dba4.jpg new file mode 100644 index 0000000..957f357 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/06/81b35169-9b54-419d-8a45-ff3d9021dba4.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/06/888217e4-51c2-440d-a16f-d254776c6fe2.jpg b/ruoyi/uploadPath/upload/2025/03/06/888217e4-51c2-440d-a16f-d254776c6fe2.jpg new file mode 100644 index 0000000..e3c465f Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/06/888217e4-51c2-440d-a16f-d254776c6fe2.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/06/99285780-6fae-4580-8eb2-d875a8f34c04.jpg b/ruoyi/uploadPath/upload/2025/03/06/99285780-6fae-4580-8eb2-d875a8f34c04.jpg new file mode 100644 index 0000000..957f357 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/06/99285780-6fae-4580-8eb2-d875a8f34c04.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/06/a4ca818c-7a31-4d78-b02b-0eabd2b6e87c.jpg b/ruoyi/uploadPath/upload/2025/03/06/a4ca818c-7a31-4d78-b02b-0eabd2b6e87c.jpg new file mode 100644 index 0000000..f0ade35 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/06/a4ca818c-7a31-4d78-b02b-0eabd2b6e87c.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/06/c34192f7-d30d-4659-8662-042c484784f2.jpg b/ruoyi/uploadPath/upload/2025/03/06/c34192f7-d30d-4659-8662-042c484784f2.jpg new file mode 100644 index 0000000..957f357 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/06/c34192f7-d30d-4659-8662-042c484784f2.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/06/ccbf4ea6-9e4f-43c7-9c70-7609483a6e87.jpg b/ruoyi/uploadPath/upload/2025/03/06/ccbf4ea6-9e4f-43c7-9c70-7609483a6e87.jpg new file mode 100644 index 0000000..957f357 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/06/ccbf4ea6-9e4f-43c7-9c70-7609483a6e87.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/06/eef0c68b-2aed-4ee6-8bcc-562bbdd94631.jpg b/ruoyi/uploadPath/upload/2025/03/06/eef0c68b-2aed-4ee6-8bcc-562bbdd94631.jpg new file mode 100644 index 0000000..725807c Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/06/eef0c68b-2aed-4ee6-8bcc-562bbdd94631.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/06/f307813a-f13d-4bb7-a180-9fe0f10ee2c8.jpg b/ruoyi/uploadPath/upload/2025/03/06/f307813a-f13d-4bb7-a180-9fe0f10ee2c8.jpg new file mode 100644 index 0000000..957f357 Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/06/f307813a-f13d-4bb7-a180-9fe0f10ee2c8.jpg differ diff --git a/ruoyi/uploadPath/upload/2025/03/06/fa3d2760-58cf-4ed3-ae13-07cd6b79ca67.jpg b/ruoyi/uploadPath/upload/2025/03/06/fa3d2760-58cf-4ed3-ae13-07cd6b79ca67.jpg new file mode 100644 index 0000000..725807c Binary files /dev/null and b/ruoyi/uploadPath/upload/2025/03/06/fa3d2760-58cf-4ed3-ae13-07cd6b79ca67.jpg differ