From da2b45f3443f53940b62ed80b2c7d73d4a07d330 Mon Sep 17 00:00:00 2001 From: zt Date: Fri, 21 Mar 2025 16:49:51 +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 --- .../common/enums/RecruitApplyStatus.java | 4 +++ .../IBgtProjectRecruitApplyService.java | 3 +-- .../impl/BgtProjectRecruitServiceImpl.java | 7 +++++ .../java/com/ruoyi/task/BusinessTask.java | 27 ++++++++++--------- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/RecruitApplyStatus.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/RecruitApplyStatus.java index bb81971..61de9f9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/RecruitApplyStatus.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/RecruitApplyStatus.java @@ -48,4 +48,8 @@ public enum RecruitApplyStatus return Arrays.asList(WORKING.getCode(), OUT_WORK.getCode()); } + //满员 + public static List getFull(){ + return Arrays.asList(WORKING.getCode(), WGZ_PASS.getCode()); + } } 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 3dc374d..caaac5b 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 @@ -11,7 +11,6 @@ import com.ruoyi.wgz.bo.req.WgzAppUnderwayReq; import com.ruoyi.wgz.bo.res.WgzAppUnderwayRes; import com.ruoyi.wgz.bo.rests.WgzAppUserAllRecruitmentTwo; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RequestBody; import java.util.Collection; import java.util.List; @@ -141,7 +140,7 @@ public interface IBgtProjectRecruitApplyService extends IServicePlus page = bgtProjectRecruitApplyService.recruitApplyList(userDTO); + + int count = bgtProjectRecruitApplyService.count(Wrappers.lambdaQuery() + .eq(BgtProjectRecruitApply::getRecruitId, vo.getId()) + .in(BgtProjectRecruitApply::getStatus, RecruitApplyStatus.getFull())); + if(count == vo.getRecruitStaffNum()){ + vo.setStatus(RecruitStatus.FULL.getCode()); + } vo.setApplyList(page.getRows()); } return PageUtils.buildDataInfo(queryVOPage); 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 19a4fcf..c42c70f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/task/BusinessTask.java +++ b/ruoyi-system/src/main/java/com/ruoyi/task/BusinessTask.java @@ -5,6 +5,7 @@ import cn.hutool.core.lang.Console; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.bgt.domain.BgtProjectRecruit; import com.ruoyi.bgt.domain.BgtProjectRecruitApply; +import com.ruoyi.bgt.domain.dto.BgtScoreDTO; import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService; import com.ruoyi.bgt.service.IBgtProjectRecruitService; import com.ruoyi.common.constants.WgzAndBgtMessageConstant; @@ -24,6 +25,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -123,6 +125,9 @@ public class BusinessTask //任务下的招工 List recruitList = recruitService.list(Wrappers.lambdaQuery() .in(BgtProjectRecruit::getTaskId, taskIds)); + + Map map = recruitList.stream().collect(Collectors.toMap(BgtProjectRecruit::getId, BgtProjectRecruit::getUserId)); + List recruitIds = recruitList.stream().map(BgtProjectRecruit::getId).collect(Collectors.toList()); if(CollectionUtil.isNotEmpty(recruitIds)){ //招工下的人员 @@ -130,25 +135,21 @@ public class BusinessTask .in(BgtProjectRecruitApply::getRecruitId, recruitIds)); //筛选已离场的 List outList = applyList.stream().filter(apply -> apply.getStatus().equals(RecruitApplyStatus.OUT_WORK.getCode())).collect(Collectors.toList()); - List addList = new ArrayList<>(); + for (BgtProjectRecruitApply bgtProjectRecruitApply : outList) { WgzScoreRecord byUserIdAndRecruitApplyId = wgzScoreRecordService.getByUserIdAndRecruitApplyId(bgtProjectRecruitApply.getUserId(), bgtProjectRecruitApply.getId()); if (byUserIdAndRecruitApplyId == null) { - WgzScoreRecord wgzScoreRecord = new WgzScoreRecord(); - wgzScoreRecord.setRecruitId(bgtProjectRecruitApply.getRecruitId()); - wgzScoreRecord.setRecruitApplyId(bgtProjectRecruitApply.getId()); - wgzScoreRecord.setScore(5D); - wgzScoreRecord.setContent("默认评分"); - wgzScoreRecord.setCreateBy("系统"); - wgzScoreRecord.setUpdateBy("系统"); - - addList.add(wgzScoreRecord); + BgtScoreDTO bgtScoreDTO = new BgtScoreDTO(); + bgtScoreDTO.setScore(new BigDecimal(5)); + bgtScoreDTO.setRecruitId(bgtProjectRecruitApply.getRecruitId()); + bgtScoreDTO.setRecruitApplyId(bgtProjectRecruitApply.getId()); + bgtScoreDTO.setUserId(bgtProjectRecruitApply.getUserId()); + bgtScoreDTO.setScoreBy(map.get(bgtProjectRecruitApply.getRecruitId())); + bgtScoreDTO.setContent("默认评分"); + iBgtProjectRecruitApplyService.score(bgtScoreDTO); } } - if(CollectionUtil.isNotEmpty(addList)){ - wgzScoreRecordService.saveBatch(addList); - } } } Console.log("务工评价任务结束！");