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 6bed0c0..80801b8 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 @@ -1,10 +1,14 @@ 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.dto.BgtGetWgzAnnexDTO; import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.domain.Annex; import com.ruoyi.common.service.IAnnexService; +import com.ruoyi.common.utils.PageUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -105,14 +109,16 @@ public class AnnexController extends BaseController { @ApiOperation("包工头获取务工者附件") @GetMapping("/getWgzAnnex") - public AjaxResult> getWgzAnnex(Long recruitId,Long userId,String annexType) { - List list = iAnnexService.list(Wrappers.lambdaQuery() - .eq(Annex::getRecruitId, recruitId) - .eq(Annex::getUserId, userId) + public TableDataInfo getWgzAnnex(BgtGetWgzAnnexDTO dto) { + List list = Arrays.asList("1", "2"); + String annexType = dto.getAnnexType(); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() + .eq(Annex::getRecruitId, dto.getRecruitId()) + .eq(Annex::getUserId, dto.getUserId()) .eq(Annex::getUserType, WGZ) - .eq(!"3".equals(annexType),Annex::getAnnexType, annexType) - .in("3".equals(annexType),Annex::getAnnexType, Arrays.asList("1","2") - )); - return AjaxResult.success(list); + .eq(!"3".equals(annexType), Annex::getAnnexType, annexType) + .in("3".equals(annexType), Annex::getAnnexType, list); + Page result = iAnnexService.page(PageUtils.buildPage(), wrapper); + return PageUtils.buildDataInfo(result); } } 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 new file mode 100644 index 0000000..56067fe --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtGetWgzAnnexDTO.java @@ -0,0 +1,37 @@ +package com.ruoyi.bgt.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + + +@Data +@NoArgsConstructor +@Accessors(chain = true) +@ApiModel("App包工头看务工者查询对象") +public class BgtGetWgzAnnexDTO { + /** 分页大小 */ + @ApiModelProperty("分页大小") + private Integer pageSize; + /** 当前页数 */ + @ApiModelProperty("当前页数") + private Integer pageNum; + + @ApiModelProperty("招工ID") + private Long recruitId; + + @ApiModelProperty("用户ID") + private Long userId; + + @ApiModelProperty("附件类型") + private String annexType; + + + + + + + +}