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

优化

Browse Source
This commit is contained in:
zt
2025-03-25 15:49:27 +08:00
parent 7f5eab72e1
commit 8fe084ddb7
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/AnnexController.java
View File

@ -3,10 +3,13 @@ package com.ruoyi.web.controller.common;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.bgt.domain.BgtProjectRecruitApply;
import com.ruoyi.bgt.domain.dto.BgtGetWgzAnnexDTO; import com.ruoyi.bgt.domain.dto.BgtGetWgzAnnexDTO;
import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.domain.Annex; import com.ruoyi.common.domain.Annex;
import com.ruoyi.common.exception.BaseException;
import com.ruoyi.common.service.IAnnexService; import com.ruoyi.common.service.IAnnexService;
import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.PageUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@ -36,6 +39,8 @@ public class AnnexController extends BaseController {
private final IAnnexService iAnnexService; private final IAnnexService iAnnexService;
private final IBgtProjectRecruitApplyService recordApplyService;
/** /**
* 查询附件列表 * 查询附件列表
*/ */
@ -110,10 +115,15 @@ public class AnnexController extends BaseController {
@ApiOperation("包工头获取务工者附件") @ApiOperation("包工头获取务工者附件")
@GetMapping("/getWgzAnnex") @GetMapping("/getWgzAnnex")
public TableDataInfo<Annex> getWgzAnnex(BgtGetWgzAnnexDTO dto) { public TableDataInfo<Annex> getWgzAnnex(BgtGetWgzAnnexDTO dto) {
BgtProjectRecruitApply byId = recordApplyService.getById(dto.getRecruitApplyId());
if(byId == null){
throw new BaseException("信息不存在");
}
List<String> list = Arrays.asList("1", "2"); List<String> list = Arrays.asList("1", "2");
String annexType = dto.getAnnexType(); String annexType = dto.getAnnexType();
LambdaQueryWrapper<Annex> wrapper = Wrappers.<Annex>lambdaQuery() LambdaQueryWrapper<Annex> wrapper = Wrappers.<Annex>lambdaQuery()
.eq(Annex::getRecruitId, dto.getRecruitId()) .eq(Annex::getRecruitId, byId.getRecruitId())
.eq(Annex::getUserId, dto.getUserId()) .eq(Annex::getUserId, dto.getUserId())
.eq(Annex::getUserType, WGZ) .eq(Annex::getUserType, WGZ)
.eq(!"3".equals(annexType), Annex::getAnnexType, annexType) .eq(!"3".equals(annexType), Annex::getAnnexType, annexType)

3
ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtGetWgzAnnexDTO.java
View File

@ -28,6 +28,9 @@ public class BgtGetWgzAnnexDTO {
@ApiModelProperty("附件类型") @ApiModelProperty("附件类型")
private String annexType; private String annexType;
@ApiModelProperty("招工申请ID")
private Long recruitApplyId;