From 21ded5ae19412f87ce0d8ca70e5c4b1608b54d25 Mon Sep 17 00:00:00 2001 From: zt Date: Thu, 20 Mar 2025 16:41:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppBgtProjectRecruitApplyController.java | 2 +- .../bgt/AppBgtProjectRecruitController.java | 10 +++++++ .../bgt/AppBgtProjectTaskController.java | 9 ++++++ .../IBgtProjectRecruitApplyService.java | 8 ++++- .../BgtProjectRecruitApplyServiceImpl.java | 29 +++++++++++++++++-- .../ruoyi/common/service/IAnnexService.java | 4 +++ .../common/service/impl/AnnexServiceImpl.java | 24 +++++++++++++-- .../java/com/ruoyi/task/BusinessTask.java | 10 +++---- .../wgz/service/IWgzDailyClockService.java | 5 ++++ .../ruoyi/wgz/service/IWgzLeaveService.java | 5 ++++ .../service/IWgzPayCalculationService.java | 13 +++++++-- .../wgz/service/IWgzReissueacardService.java | 5 ++++ .../impl/WgzDailyClockServiceImpl.java | 11 +++++++ .../wgz/service/impl/WgzLeaveServiceImpl.java | 9 ++++++ .../impl/WgzPayCalculationServiceImpl.java | 9 ++++++ .../impl/WgzReissueacardServiceImpl.java | 10 +++++++ .../mapper/common/AnnexRecordMapper.xml | 26 +++++++++++++++++ 17 files changed, 174 insertions(+), 15 deletions(-) create mode 100644 ruoyi-system/src/main/resources/mapper/common/AnnexRecordMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectRecruitApplyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectRecruitApplyController.java index 76b767b..d7fa274 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectRecruitApplyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectRecruitApplyController.java @@ -97,7 +97,7 @@ public class AppBgtProjectRecruitApplyController extends BaseController { @GetMapping("/check/{id}") public AjaxResult check(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { - return AjaxResult.success(false); + return AjaxResult.success(iBgtProjectRecruitApplyService.check(id)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectRecruitController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectRecruitController.java index 9c8c707..7bc502b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectRecruitController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectRecruitController.java @@ -9,12 +9,16 @@ import com.ruoyi.bgt.domain.vo.BgtProjectRecruitDetailWgzListVO; import com.ruoyi.bgt.domain.vo.BgtProjectRecruitVO; import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService; import com.ruoyi.bgt.service.IBgtProjectRecruitService; +import com.ruoyi.bgt.service.IBgtUserService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.BgtUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.exception.BaseException; +import com.ruoyi.common.utils.SecurityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -41,6 +45,8 @@ public class AppBgtProjectRecruitController extends BaseController { private final IBgtProjectRecruitApplyService iBgtProjectRecruitApplyService; + private final IBgtUserService bgtUserService; + /** * 查询包工头招工列表 状态为通过和报名 */ @@ -90,6 +96,10 @@ public class AppBgtProjectRecruitController extends BaseController { @RepeatSubmit @PostMapping() public AjaxResult add(@Validated @RequestBody BgtProjectRecruit bo) { + BgtUser byId = bgtUserService.getById(SecurityUtils.getAppUserId()); + if(byId == null || byId.getIdentityCard() == null){ + throw new BaseException("当前用户还未实名认证！"); + } return AjaxResult.success(iBgtProjectRecruitService.insert(bo)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskController.java index 0e97667..af60c9d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskController.java @@ -3,12 +3,15 @@ package com.ruoyi.web.controller.bgt; import com.ruoyi.bgt.domain.dto.BgtProjectTaskUserDTO; import com.ruoyi.bgt.domain.vo.BgtProjectRecruitApplyVO; import com.ruoyi.bgt.domain.vo.BgtProjectTaskUseCountVO; +import com.ruoyi.bgt.service.IBgtUserService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.BgtUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.exception.BaseException; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.fbs.domain.FbsProjectTask; import com.ruoyi.fbs.domain.dto.AppTaskDTO; @@ -38,6 +41,8 @@ public class AppBgtProjectTaskController extends BaseController { private final IFbsProjectTaskService iFbsProjectTaskService; + private final IBgtUserService bgtUserService; + /** * 首页任务列表 任务状态 申请(0) 是否我的任务 false * 我的任务列表 任务状态 申请(0) 进行(1) 完成(2) 是否我的任务 true @@ -118,6 +123,10 @@ public class AppBgtProjectTaskController extends BaseController { bo.setSubId(num); bo.setUserId(SecurityUtils.getAppUserId()); bo.setStatus("1"); + BgtUser byId = bgtUserService.getById(SecurityUtils.getAppUserId()); + if(byId == null || byId.getIdentityCard() == null){ + throw new BaseException("当前用户还未实名认证！"); + } return AjaxResult.success(iFbsProjectTaskService.insert(bo)); } 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 3a50f4c..79c6001 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 @@ -113,6 +113,12 @@ public interface IBgtProjectRecruitApplyService extends IServicePlus mp = new HashMap<>(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/common/service/IAnnexService.java b/ruoyi-system/src/main/java/com/ruoyi/common/service/IAnnexService.java index aae3a6a..96de81a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/common/service/IAnnexService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/common/service/IAnnexService.java @@ -86,4 +86,8 @@ public interface IAnnexService extends IServicePlus { */ void deleteByUserIdAndRecruitIdAndType(Long userId,Long recruitId,String type); + /** + * 检查入场材料 + */ + boolean checkEntry(Long userId,Long recruitId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/common/service/impl/AnnexServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/common/service/impl/AnnexServiceImpl.java index 359505e..dff26bb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/common/service/impl/AnnexServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/common/service/impl/AnnexServiceImpl.java @@ -19,9 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Collection; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import static com.ruoyi.common.constant.Constants.WGZ; @@ -164,4 +162,24 @@ public class AnnexServiceImpl extends ServicePlusImpl implem baseMapper.delete(Wrappers.lambdaQuery().eq(Annex::getUserId,userId) .eq(Annex::getRecruitId,recruitId).eq(Annex::getAnnexType,type).eq(Annex::getUserType,WGZ)); } + + @Override + public boolean checkEntry(Long userId, Long recruitId) { + + boolean result = false; + + LambdaQueryWrapper wra = new LambdaQueryWrapper(). + eq(Annex::getUserType,WGZ). + eq(Annex::getUserId,userId). + eq(Annex::getRecruitId,recruitId). + in(Annex::getAnnexType, Arrays.asList("1","2")); + List annexes = baseMapper.selectList(wra); + if(CollectionUtil.isNotEmpty(annexes)){ + Set collect = annexes.stream().map(Annex::getAnnexType).collect(Collectors.toSet()); + if(collect.contains("1") && collect.contains("2")){ + result = true; + } + } + return result; + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/task/BusinessTask.java b/ruoyi-system/src/main/java/com/ruoyi/task/BusinessTask.java index 3ae043a..19a4fcf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/task/BusinessTask.java +++ b/ruoyi-system/src/main/java/com/ruoyi/task/BusinessTask.java @@ -100,11 +100,11 @@ public class BusinessTask public void entry() { Console.log("开始招工进场任务"); - recruitApplyService.lambdaUpdate() - .le(BgtProjectRecruitApply::getEntryTime, LocalDate.now()) - .eq(BgtProjectRecruitApply::getStatus,RecruitApplyStatus.WGZ_PASS.getCode()) - .set(BgtProjectRecruitApply::getStatus,RecruitApplyStatus.BGT_REFUSE.getCode()) - .update(); +// recruitApplyService.lambdaUpdate() +// .le(BgtProjectRecruitApply::getEntryTime, LocalDate.now()) +// .eq(BgtProjectRecruitApply::getStatus,RecruitApplyStatus.WGZ_PASS.getCode()) +// .set(BgtProjectRecruitApply::getStatus,RecruitApplyStatus.BGT_REFUSE.getCode()) +// .update(); Console.log("招工进场任务结束！"); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzDailyClockService.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzDailyClockService.java index 506a780..87c056f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzDailyClockService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzDailyClockService.java @@ -108,4 +108,9 @@ public interface IWgzDailyClockService extends IServicePlus { * 查看和审核 */ Boolean appUpdate(BgtDailyClockUpdateDTO dto); + + /** + * 是否还有在审核的申请 + */ + Boolean isThereAnyApplicationsInReview(Long recruitId,Long userId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzLeaveService.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzLeaveService.java index 35f9a73..10ca3ce 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzLeaveService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzLeaveService.java @@ -115,6 +115,11 @@ public interface IWgzLeaveService extends IServicePlus { */ void refuseBatch(Long recruitId,Long userId); + /** + * 是否还有在审核的申请 + */ + Boolean isThereAnyApplicationsInReview(Long recruitId,Long userId); + /** * 包工头审核列表 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzPayCalculationService.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzPayCalculationService.java index 0e26a1b..dadf270 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzPayCalculationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzPayCalculationService.java @@ -16,9 +16,7 @@ import com.ruoyi.wgz.bo.res.WgzAppApplyForPayrollSettlementListRes; import com.ruoyi.wgz.bo.res.WgzAppUserApplyForPayrollSettlementDetails; import com.ruoyi.wgz.domain.WgzPayCalculation; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PathVariable; -import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Collection; import java.util.List; @@ -126,7 +124,18 @@ public interface IWgzPayCalculationService extends IServicePlus record(BgtPayCalculationRecordDTO dto); + /** + * 包工头结算 + */ Boolean bgtAdd(BgtApplyForWgzPayAddDTO dto); + /** + * 结算基础信息 + */ BgtApplyForWgzPayAddInfoVO payInfo(Long userId, Long recruitId); + + /** + * 是否还有在审核的申请 + */ + Boolean isThereAnyApplicationsInReview(Long recruitId,Long userId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzReissueacardService.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzReissueacardService.java index 8794c8d..c3578b4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzReissueacardService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzReissueacardService.java @@ -96,4 +96,9 @@ public interface IWgzReissueacardService extends IServicePlus { */ void refuseBatch(Long recruitId,Long userId); + /** + * 是否还有在审核的申请 + */ + Boolean isThereAnyApplicationsInReview(Long recruitId,Long userId); + } 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 c2f970a..4428758 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 @@ -1,6 +1,7 @@ package com.ruoyi.wgz.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -398,4 +399,14 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl list = list(Wrappers.lambdaQuery() + .eq(WgzDailyClock::getRecruitId, recruitId) + .eq(WgzDailyClock::getUserId, userId) + .eq(WgzDailyClock::getStatus, "1") + .in(WgzDailyClock::getAuditorType, AuditStatus.getToAudit())); + return CollectionUtil.isNotEmpty(list); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java index 3e4845d..fa096ad 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java @@ -353,6 +353,15 @@ public class WgzLeaveServiceImpl extends ServicePlusImpl list = list(Wrappers.lambdaQuery() + .eq(WgzLeave::getRecruitId, recruitId) + .eq(WgzLeave::getUserId, userId) + .in(WgzLeave::getAuditorType, AuditStatus.getToAudit())); + return CollectionUtil.isNotEmpty(list); + } + @Override public TableDataInfo bgtLeaveAudit(BgtAuditListDTO dto) { dto.setAuditorUserId(SecurityUtils.getAppUserId()); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java index 4023af6..f454e63 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java @@ -616,4 +616,13 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl list = list(Wrappers.lambdaQuery() + .eq(WgzPayCalculation::getRecruitId, recruitId) + .eq(WgzPayCalculation::getUserId, userId) + .in(WgzPayCalculation::getAuditorType, AuditStatus.getToAudit())); + return CollectionUtil.isNotEmpty(list); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java index 2fcb99c..54375b1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.wgz.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -317,4 +318,13 @@ public class WgzReissueacardServiceImpl extends ServicePlusImpl list = list(new LambdaQueryWrapper() + .eq(WgzReissueacard::getRecruitId, recruitId) + .eq(WgzReissueacard::getUserId, userId) + .in(WgzReissueacard::getAuditorType,AuditStatus.getToAudit())); + return CollectionUtil.isNotEmpty(list); + } } diff --git a/ruoyi-system/src/main/resources/mapper/common/AnnexRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/common/AnnexRecordMapper.xml new file mode 100644 index 0000000..01c7e22 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/common/AnnexRecordMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + +