diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/AnnexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/AnnexController.java index 80801b8..bc533ec 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/AnnexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/AnnexController.java @@ -3,10 +3,13 @@ package com.ruoyi.web.controller.common; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; 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.service.IBgtProjectRecruitApplyService; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.domain.Annex; +import com.ruoyi.common.exception.BaseException; import com.ruoyi.common.service.IAnnexService; import com.ruoyi.common.utils.PageUtils; import io.swagger.annotations.Api; @@ -36,6 +39,8 @@ public class AnnexController extends BaseController { private final IAnnexService iAnnexService; + private final IBgtProjectRecruitApplyService recordApplyService; + /** * 查询附件列表 */ @@ -110,10 +115,15 @@ public class AnnexController extends BaseController { @ApiOperation("包工头获取务工者附件") @GetMapping("/getWgzAnnex") public TableDataInfo getWgzAnnex(BgtGetWgzAnnexDTO dto) { + + BgtProjectRecruitApply byId = recordApplyService.getById(dto.getRecruitApplyId()); + if(byId == null){ + throw new BaseException("信息不存在"); + } List list = Arrays.asList("1", "2"); String annexType = dto.getAnnexType(); LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() - .eq(Annex::getRecruitId, dto.getRecruitId()) + .eq(Annex::getRecruitId, byId.getRecruitId()) .eq(Annex::getUserId, dto.getUserId()) .eq(Annex::getUserType, WGZ) .eq(!"3".equals(annexType), Annex::getAnnexType, annexType) diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtGetWgzAnnexDTO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtGetWgzAnnexDTO.java index 56067fe..4d71e9e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtGetWgzAnnexDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtGetWgzAnnexDTO.java @@ -28,6 +28,9 @@ public class BgtGetWgzAnnexDTO { @ApiModelProperty("附件类型") private String annexType; + @ApiModelProperty("招工申请ID") + private Long recruitApplyId; +