diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzAppController.java index e8ea589..30b53b5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/WgzAppController.java @@ -421,6 +421,17 @@ return AjaxResult.success(iBgtProjectRecruitService.userProjectDetails(id)); } + /** + * 【首页】【招工列表】 务工者是否进入工地 + */ + @ApiOperation("【首页】【招工列表】 务工者是否进入工地") + @GetMapping("/userIsInTheSite") + public AjaxResult userIsInTheSite() { + return AjaxResult.success(iBgtProjectRecruitApplyService.userIsInTheSite(SecurityUtils.getAppUserId())); + } + + + /** * 【首页】【招工列表】【项目详情】 项目详情·申请报名(还未校验工种是否匹配工地岗位) */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/IBgtProjectRecruitApplyService.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/IBgtProjectRecruitApplyService.java index b9f70e4..8b93e87 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/IBgtProjectRecruitApplyService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/IBgtProjectRecruitApplyService.java @@ -121,6 +121,11 @@ public interface IBgtProjectRecruitApplyService extends IServicePlus(). - eq(BgtProjectRecruitApply::getUserId, appUserId). - in(BgtProjectRecruitApply::getStatus, "3", "5") - ); - if (i > 0) { + + if (userIsInTheSite(appUserId)) { throw new RuntimeException("已有工地!不可再次申请!"); } //3-3、是否重复申请同一工地(先检查最后一次是否离场或取消,如果是就还能再次申请这个项目,否则无法申请) @@ -490,6 +486,16 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl(). + eq(BgtProjectRecruitApply::getUserId, wgzUserId). + in(BgtProjectRecruitApply::getStatus, "3", "5") + ); + return i>0; + } + @Override public TableDataInfo userList(BgtAttendanceDayDTO dto) { Page queryDTOPage = new Page<>();