Merge remote-tracking branch 'origin/master'
This commit is contained in:
		@ -3,6 +3,7 @@ package com.ruoyi.wgz.service;
 | 
			
		||||
import com.ruoyi.wgz.bo.req.WgzAppGetMessageListReq;
 | 
			
		||||
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.domain.WgzMessage;
 | 
			
		||||
import com.ruoyi.wgz.bo.WgzMessageQueryBo;
 | 
			
		||||
import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 | 
			
		||||
@ -78,4 +79,9 @@ public interface IWgzMessageService extends IServicePlus<WgzMessage> {
 | 
			
		||||
	 * 消息列表
 | 
			
		||||
	 */
 | 
			
		||||
	TableDataInfo<WgzAppGetMessageListRes> userGetMessageList(@Validated WgzAppGetMessageListReq req);
 | 
			
		||||
 | 
			
		||||
	/**
 | 
			
		||||
	 * 根据消息招工申请信息的主键ID去获取招工信息
 | 
			
		||||
	 */
 | 
			
		||||
	WgzAppRegistrationInformationRes userRegistrationInformation(Long messageId);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -3,7 +3,11 @@ 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.mapper.BgtProjectRecruitMapper;
 | 
			
		||||
import com.ruoyi.bgt.service.IBgtProjectRecruitService;
 | 
			
		||||
import com.ruoyi.common.core.domain.entity.SysDictData;
 | 
			
		||||
import com.ruoyi.common.domain.Annex;
 | 
			
		||||
import com.ruoyi.common.service.IAnnexService;
 | 
			
		||||
import com.ruoyi.common.utils.PageUtils;
 | 
			
		||||
import com.ruoyi.common.core.page.PagePlus;
 | 
			
		||||
import com.ruoyi.common.core.page.TableDataInfo;
 | 
			
		||||
@ -13,6 +17,7 @@ import com.ruoyi.wgz.bo.req.WgzAppGetMessageListReq;
 | 
			
		||||
import com.ruoyi.wgz.bo.req.WgzAppLeaveHistoryListPageReq;
 | 
			
		||||
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 org.springframework.beans.factory.annotation.Autowired;
 | 
			
		||||
import org.springframework.scheduling.annotation.Async;
 | 
			
		||||
@ -42,6 +47,9 @@ public class WgzMessageServiceImpl extends ServicePlusImpl<WgzMessageMapper, Wgz
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private ISysDictTypeService dictTypeService;
 | 
			
		||||
 | 
			
		||||
	@Autowired
 | 
			
		||||
	private IAnnexService annexService;
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
    public WgzMessage queryById(Long id){
 | 
			
		||||
        return getById(id);
 | 
			
		||||
@ -149,4 +157,17 @@ public class WgzMessageServiceImpl extends ServicePlusImpl<WgzMessageMapper, Wgz
 | 
			
		||||
		queryDTOPage.setSize(req.getPageSize());
 | 
			
		||||
		return PageUtils.buildDataInfo(baseMapper.userGetMessageList(queryDTOPage));
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
	@Override
 | 
			
		||||
	public WgzAppRegistrationInformationRes userRegistrationInformation(Long messageId) {
 | 
			
		||||
		Long appUserId = SecurityUtils.getAppUserId();
 | 
			
		||||
		//1、获取当前消息的招工ID
 | 
			
		||||
		WgzMessage byId = this.getById(messageId);
 | 
			
		||||
		//2、根据招工ID得到招工信息及附件
 | 
			
		||||
		WgzAppRegistrationInformationRes byRecruitIdData = baseMapper.findByRecruitIdData(byId.getId());
 | 
			
		||||
//		List<Annex> byUserIdAndRecruitId = annexService.findByUserIdAndRecruitId(appUserId, byId.getId(), new String[]{"1"});
 | 
			
		||||
//		byRecruitIdData.setAnnex(null);
 | 
			
		||||
		return byRecruitIdData;
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user