细节修改
This commit is contained in:
		@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.injector.methods.DeleteById;
 | 
			
		||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 | 
			
		||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 | 
			
		||||
import com.ruoyi.bgt.bo.BgtProjectRecruitApplyQueryBo;
 | 
			
		||||
import com.ruoyi.bgt.domain.BgtProjectRecruit;
 | 
			
		||||
import com.ruoyi.bgt.domain.BgtProjectRecruitApply;
 | 
			
		||||
import com.ruoyi.bgt.domain.dto.BgtAttendanceDayDTO;
 | 
			
		||||
import com.ruoyi.bgt.domain.dto.BgtProjectRecruitApplyConsentDTO;
 | 
			
		||||
@ -15,6 +16,9 @@ import com.ruoyi.bgt.domain.dto.BgtScoreDTO;
 | 
			
		||||
import com.ruoyi.bgt.domain.vo.BgtProjectRecruitApplyVO;
 | 
			
		||||
import com.ruoyi.bgt.mapper.BgtProjectRecruitApplyMapper;
 | 
			
		||||
import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService;
 | 
			
		||||
import com.ruoyi.bgt.service.IBgtProjectRecruitService;
 | 
			
		||||
import com.ruoyi.common.core.domain.entity.SysUser;
 | 
			
		||||
import com.ruoyi.common.core.domain.model.LoginUser;
 | 
			
		||||
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 | 
			
		||||
import com.ruoyi.common.core.page.TableDataInfo;
 | 
			
		||||
import com.ruoyi.common.enums.RecruitApplyStatus;
 | 
			
		||||
@ -22,6 +26,7 @@ import com.ruoyi.common.exception.BaseException;
 | 
			
		||||
import com.ruoyi.common.service.IAnnexService;
 | 
			
		||||
import com.ruoyi.common.utils.PageUtils;
 | 
			
		||||
import com.ruoyi.common.utils.SecurityUtils;
 | 
			
		||||
import com.ruoyi.system.service.ISysUserService;
 | 
			
		||||
import com.ruoyi.wgz.bo.req.WgzAppRegisteredProjectReq;
 | 
			
		||||
import com.ruoyi.wgz.bo.req.WgzAppUnderwayReq;
 | 
			
		||||
import com.ruoyi.wgz.bo.res.WgzAppUnderwayRes;
 | 
			
		||||
@ -35,10 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
 | 
			
		||||
 | 
			
		||||
import java.text.DecimalFormat;
 | 
			
		||||
import java.time.LocalDate;
 | 
			
		||||
import java.util.Arrays;
 | 
			
		||||
import java.util.Collection;
 | 
			
		||||
import java.util.List;
 | 
			
		||||
import java.util.Map;
 | 
			
		||||
import java.util.*;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * 包工头招工申请Service业务层处理
 | 
			
		||||
@ -56,6 +58,10 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl<BgtProjec
 | 
			
		||||
	private IWgzScoreRecordService scoreRecordService;
 | 
			
		||||
	@Autowired
 | 
			
		||||
	private IWgzUserService wgzUserService;
 | 
			
		||||
	@Autowired
 | 
			
		||||
	private IBgtProjectRecruitApplyService iBgtProjectRecruitApplyService;
 | 
			
		||||
	@Autowired
 | 
			
		||||
	private IBgtProjectRecruitService iBgtProjectRecruitService;
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
    public BgtProjectRecruitApply queryById(Long id){
 | 
			
		||||
@ -169,16 +175,21 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl<BgtProjec
 | 
			
		||||
	public Boolean userApplyForRegistration(Long id) {
 | 
			
		||||
		//1、获取当前用户
 | 
			
		||||
		Long appUserId = SecurityUtils.getAppUserId();
 | 
			
		||||
		BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId);
 | 
			
		||||
		BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getId());
 | 
			
		||||
		//2、检查当前用户是否已经有工地了、检查当前用户是否满足对应工种
 | 
			
		||||
		Integer i = baseMapper.selectCount(
 | 
			
		||||
			new LambdaQueryWrapper<BgtProjectRecruitApply>().
 | 
			
		||||
			eq(BgtProjectRecruitApply::getUserId, appUserId).
 | 
			
		||||
			eq(BgtProjectRecruitApply::getStatus, "3")
 | 
			
		||||
//			isNotNull(BgtProjectRecruitApply::getEntryTime).ne(BgtProjectRecruitApply::getEntryTime, "")
 | 
			
		||||
		);
 | 
			
		||||
		if (i>0){
 | 
			
		||||
			throw new RuntimeException("已有工地!不可再次申请!");
 | 
			
		||||
		}
 | 
			
		||||
		WgzUser byId = wgzUserService.getById(appUserId);
 | 
			
		||||
		if (!Objects.equals(appById.getTypeOfWork(), byId.getTypeOfWork())){
 | 
			
		||||
			throw new RuntimeException("工种不匹配!");
 | 
			
		||||
		}
 | 
			
		||||
		//2、插入数据
 | 
			
		||||
		BgtProjectRecruitApply bgtProjectRecruitApply = new BgtProjectRecruitApply();
 | 
			
		||||
		bgtProjectRecruitApply.setRecruitId(id);
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user