优化
This commit is contained in:
@ -48,4 +48,8 @@ public enum RecruitApplyStatus
|
|||||||
return Arrays.asList(WORKING.getCode(), OUT_WORK.getCode());
|
return Arrays.asList(WORKING.getCode(), OUT_WORK.getCode());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//满员
|
||||||
|
public static List<String> getFull(){
|
||||||
|
return Arrays.asList(WORKING.getCode(), WGZ_PASS.getCode());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -11,7 +11,6 @@ import com.ruoyi.wgz.bo.req.WgzAppUnderwayReq;
|
|||||||
import com.ruoyi.wgz.bo.res.WgzAppUnderwayRes;
|
import com.ruoyi.wgz.bo.res.WgzAppUnderwayRes;
|
||||||
import com.ruoyi.wgz.bo.rests.WgzAppUserAllRecruitmentTwo;
|
import com.ruoyi.wgz.bo.rests.WgzAppUserAllRecruitmentTwo;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -141,7 +140,7 @@ public interface IBgtProjectRecruitApplyService extends IServicePlus<BgtProjectR
|
|||||||
/**
|
/**
|
||||||
* 评分
|
* 评分
|
||||||
*/
|
*/
|
||||||
Boolean score( @RequestBody BgtScoreDTO dto);
|
Boolean score( BgtScoreDTO dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 务工者取消报名
|
* 务工者取消报名
|
||||||
|
@ -177,6 +177,13 @@ public class BgtProjectRecruitServiceImpl extends ServicePlusImpl<BgtProjectRecr
|
|||||||
userDTO.setStatus(0);
|
userDTO.setStatus(0);
|
||||||
}
|
}
|
||||||
TableDataInfo<BgtProjectRecruitApplyVO> page = bgtProjectRecruitApplyService.recruitApplyList(userDTO);
|
TableDataInfo<BgtProjectRecruitApplyVO> page = bgtProjectRecruitApplyService.recruitApplyList(userDTO);
|
||||||
|
|
||||||
|
int count = bgtProjectRecruitApplyService.count(Wrappers.<BgtProjectRecruitApply>lambdaQuery()
|
||||||
|
.eq(BgtProjectRecruitApply::getRecruitId, vo.getId())
|
||||||
|
.in(BgtProjectRecruitApply::getStatus, RecruitApplyStatus.getFull()));
|
||||||
|
if(count == vo.getRecruitStaffNum()){
|
||||||
|
vo.setStatus(RecruitStatus.FULL.getCode());
|
||||||
|
}
|
||||||
vo.setApplyList(page.getRows());
|
vo.setApplyList(page.getRows());
|
||||||
}
|
}
|
||||||
return PageUtils.buildDataInfo(queryVOPage);
|
return PageUtils.buildDataInfo(queryVOPage);
|
||||||
|
@ -5,6 +5,7 @@ import cn.hutool.core.lang.Console;
|
|||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.ruoyi.bgt.domain.BgtProjectRecruit;
|
import com.ruoyi.bgt.domain.BgtProjectRecruit;
|
||||||
import com.ruoyi.bgt.domain.BgtProjectRecruitApply;
|
import com.ruoyi.bgt.domain.BgtProjectRecruitApply;
|
||||||
|
import com.ruoyi.bgt.domain.dto.BgtScoreDTO;
|
||||||
import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService;
|
import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService;
|
||||||
import com.ruoyi.bgt.service.IBgtProjectRecruitService;
|
import com.ruoyi.bgt.service.IBgtProjectRecruitService;
|
||||||
import com.ruoyi.common.constants.WgzAndBgtMessageConstant;
|
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.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
@ -123,6 +125,9 @@ public class BusinessTask
|
|||||||
//任务下的招工
|
//任务下的招工
|
||||||
List<BgtProjectRecruit> recruitList = recruitService.list(Wrappers.<BgtProjectRecruit>lambdaQuery()
|
List<BgtProjectRecruit> recruitList = recruitService.list(Wrappers.<BgtProjectRecruit>lambdaQuery()
|
||||||
.in(BgtProjectRecruit::getTaskId, taskIds));
|
.in(BgtProjectRecruit::getTaskId, taskIds));
|
||||||
|
|
||||||
|
Map<Long, Long> map = recruitList.stream().collect(Collectors.toMap(BgtProjectRecruit::getId, BgtProjectRecruit::getUserId));
|
||||||
|
|
||||||
List<Long> recruitIds = recruitList.stream().map(BgtProjectRecruit::getId).collect(Collectors.toList());
|
List<Long> recruitIds = recruitList.stream().map(BgtProjectRecruit::getId).collect(Collectors.toList());
|
||||||
if(CollectionUtil.isNotEmpty(recruitIds)){
|
if(CollectionUtil.isNotEmpty(recruitIds)){
|
||||||
//招工下的人员
|
//招工下的人员
|
||||||
@ -130,25 +135,21 @@ public class BusinessTask
|
|||||||
.in(BgtProjectRecruitApply::getRecruitId, recruitIds));
|
.in(BgtProjectRecruitApply::getRecruitId, recruitIds));
|
||||||
//筛选已离场的
|
//筛选已离场的
|
||||||
List<BgtProjectRecruitApply> outList = applyList.stream().filter(apply -> apply.getStatus().equals(RecruitApplyStatus.OUT_WORK.getCode())).collect(Collectors.toList());
|
List<BgtProjectRecruitApply> outList = applyList.stream().filter(apply -> apply.getStatus().equals(RecruitApplyStatus.OUT_WORK.getCode())).collect(Collectors.toList());
|
||||||
List<WgzScoreRecord> addList = new ArrayList<>();
|
|
||||||
for (BgtProjectRecruitApply bgtProjectRecruitApply : outList) {
|
for (BgtProjectRecruitApply bgtProjectRecruitApply : outList) {
|
||||||
WgzScoreRecord byUserIdAndRecruitApplyId = wgzScoreRecordService.getByUserIdAndRecruitApplyId(bgtProjectRecruitApply.getUserId(), bgtProjectRecruitApply.getId());
|
WgzScoreRecord byUserIdAndRecruitApplyId = wgzScoreRecordService.getByUserIdAndRecruitApplyId(bgtProjectRecruitApply.getUserId(), bgtProjectRecruitApply.getId());
|
||||||
if (byUserIdAndRecruitApplyId == null) {
|
if (byUserIdAndRecruitApplyId == null) {
|
||||||
WgzScoreRecord wgzScoreRecord = new WgzScoreRecord();
|
BgtScoreDTO bgtScoreDTO = new BgtScoreDTO();
|
||||||
wgzScoreRecord.setRecruitId(bgtProjectRecruitApply.getRecruitId());
|
bgtScoreDTO.setScore(new BigDecimal(5));
|
||||||
wgzScoreRecord.setRecruitApplyId(bgtProjectRecruitApply.getId());
|
bgtScoreDTO.setRecruitId(bgtProjectRecruitApply.getRecruitId());
|
||||||
wgzScoreRecord.setScore(5D);
|
bgtScoreDTO.setRecruitApplyId(bgtProjectRecruitApply.getId());
|
||||||
wgzScoreRecord.setContent("默认评分");
|
bgtScoreDTO.setUserId(bgtProjectRecruitApply.getUserId());
|
||||||
wgzScoreRecord.setCreateBy("系统");
|
bgtScoreDTO.setScoreBy(map.get(bgtProjectRecruitApply.getRecruitId()));
|
||||||
wgzScoreRecord.setUpdateBy("系统");
|
bgtScoreDTO.setContent("默认评分");
|
||||||
|
iBgtProjectRecruitApplyService.score(bgtScoreDTO);
|
||||||
addList.add(wgzScoreRecord);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
if(CollectionUtil.isNotEmpty(addList)){
|
|
||||||
wgzScoreRecordService.saveBatch(addList);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Console.log("务工评价任务结束!");
|
Console.log("务工评价任务结束!");
|
||||||
|
Reference in New Issue
Block a user