zt/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zt
2025-03-06 16:51:00 +08:00
parent 8d566adaa6 ec9a2aa5ea
commit f6e14c407a
36 changed files with 70 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java
View File

@ -225,7 +225,7 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
//1、获取当前人、当前工的上下班时间范围
Long appUserId = SecurityUtils.getAppUserId();
BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId);
BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getId());
BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getRecruitId());
//1、组装数据
WgzDailyClock dc = new WgzDailyClock();
BeanUtils.copyProperties(req,dc);

43
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzMessageServiceImpl.java
View File

@ -3,7 +3,9 @@ package com.ruoyi.wgz.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.bgt.domain.BgtProjectRecruitApply;
import com.ruoyi.bgt.mapper.BgtProjectRecruitMapper;
import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService;
import com.ruoyi.bgt.service.IBgtProjectRecruitService;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.domain.Annex;
@ -21,9 +23,7 @@ import com.ruoyi.wgz.bo.res.WgzAppGetMessageListRes;
import com.ruoyi.wgz.bo.res.WgzAppMessageTypeStatisticsRes;
import com.ruoyi.wgz.bo.res.WgzAppRegistrationInformationRes;
import com.ruoyi.wgz.bo.rests.WgzAppMessageTypeStatisticsTwo;
import com.ruoyi.wgz.domain.WgzLeave;
import com.ruoyi.wgz.domain.WgzReissueacard;
import com.ruoyi.wgz.domain.WgzUser;
import com.ruoyi.wgz.domain.*;
import com.ruoyi.wgz.service.IWgzLeaveService;
import com.ruoyi.wgz.service.IWgzReissueacardService;
import com.ruoyi.wgz.service.IWgzUserService;
@ -34,10 +34,10 @@ import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.wgz.bo.WgzMessageQueryBo;
import com.ruoyi.wgz.domain.WgzMessage;
import com.ruoyi.wgz.mapper.WgzMessageMapper;
import com.ruoyi.wgz.service.IWgzMessageService;
import java.time.LocalDate;
import java.util.*;
/**
@ -64,6 +64,9 @@ public class WgzMessageServiceImpl extends ServicePlusImpl<WgzMessageMapper, Wgz
@Autowired
private IWgzUserService wgzUserService;
@Autowired
private IBgtProjectRecruitApplyService iBgtProjectRecruitApplyService;
@Override
public WgzMessage queryById(Long id){
return getById(id);
@ -202,14 +205,13 @@ public class WgzMessageServiceImpl extends ServicePlusImpl<WgzMessageMapper, Wgz
@Override
public WgzAppRegistrationInformationRes userRegistrationInformation(Long messageId) {
Long appUserId = SecurityUtils.getAppUserId();
//1、获取当前消息的招工ID
WgzMessage byId = this.getById(messageId);
//2、根据招工ID得到招工信息及附件
WgzAppRegistrationInformationRes byRecruitIdData = baseMapper.findByRecruitIdData(byId.getTableId());
// List<Annex> 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<WgzMessageMapper, Wgz
WgzMessage wgzMessage = new WgzMessage().setId(req.getMessageId()).setReadStatus("1");
return baseMapper.updateById(wgzMessage) > 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.<BgtProjectRecruitApply>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";
}
}