From 14ed93900817bee5467a77489d2e2951201c7c85 Mon Sep 17 00:00:00 2001 From: zt Date: Fri, 28 Mar 2025 10:38:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8C=85=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppBgtProjectTaskProgressController.java | 11 +++- .../controller/common/AnnexController.java | 4 +- .../fbs/AppFbsProjectTaskController.java | 17 +++++ .../AppFbsProjectTaskProgressController.java | 65 +++++++++++++++++++ .../bgt/domain/BgtProjectTaskProgress.java | 6 ++ .../dto/BgtProjectTaskProgressQueryDTO.java | 3 + .../mapper/BgtProjectRecruitApplyMapper.java | 7 +- .../IBgtProjectRecruitApplyService.java | 9 ++- .../BgtProjectRecruitApplyServiceImpl.java | 9 +++ .../BgtProjectTaskProgressServiceImpl.java | 1 - .../dto/FbsProjectTaskProgressAuditDTO.java | 31 +++++++++ .../fbs/domain/dto/FbsTaskSwitchListDTO.java | 19 ++++++ .../fbs/service/IFbsProjectTaskService.java | 9 ++- .../impl/FbsProjectTaskServiceImpl.java | 17 +++++ .../bgt/BgtProjectRecruitApplyMapper.xml | 35 ++++++++++ .../bgt/BgtProjectTaskProgressMapper.xml | 22 +++++-- 16 files changed, 249 insertions(+), 16 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectTaskProgressController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/fbs/domain/dto/FbsProjectTaskProgressAuditDTO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/fbs/domain/dto/FbsTaskSwitchListDTO.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskProgressController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskProgressController.java index 86cb7f2..4f519fb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskProgressController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskProgressController.java @@ -7,12 +7,15 @@ import com.ruoyi.bgt.domain.dto.BgtProjectTaskProgressQueryDTO; import com.ruoyi.bgt.domain.vo.BgtProjectTaskProgressDetailVO; import com.ruoyi.bgt.domain.vo.BgtProjectTaskProgressVO; import com.ruoyi.bgt.service.IBgtProjectTaskProgressService; +import com.ruoyi.bgt.service.IBgtUserService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.BgtUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.SecurityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -36,12 +39,15 @@ public class AppBgtProjectTaskProgressController extends BaseController { private final IBgtProjectTaskProgressService iBgtProjectTaskProgressService; + private final IBgtUserService iBgtUserService; + /** * 查询包工头项目任务进度列表 */ @ApiOperation("查询项目任务进度列表") @GetMapping("/list") public TableDataInfo list(@Validated BgtProjectTaskProgressQueryDTO bo) { + bo.setUploaderId(SecurityUtils.getAppUserId()); return iBgtProjectTaskProgressService.appQueryPageList(bo); } @@ -64,7 +70,10 @@ public class AppBgtProjectTaskProgressController extends BaseController { @RepeatSubmit @PostMapping() public AjaxResult add(@Validated @RequestBody BgtProjectTaskProgressDTO dto) { - return AjaxResult.success(iBgtProjectTaskProgressService.insert(BeanUtil.copyProperties(dto, BgtProjectTaskProgress.class))); + BgtUser bgtUser = iBgtUserService.selectUserByUserId(dto.getReviewerId()); + BgtProjectTaskProgress bgtProjectTaskProgress = BeanUtil.copyProperties(dto, BgtProjectTaskProgress.class); + bgtProjectTaskProgress.setReviewerName(bgtUser.getUsername()); + return AjaxResult.success(iBgtProjectTaskProgressService.insert(bgtProjectTaskProgress)); } } 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 5f32324..b028128 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 @@ -120,14 +120,14 @@ public class AnnexController extends BaseController { if(byId == null){ throw new BaseException("信息不存在"); } - List list = Arrays.asList("1", "2"); + List list = Arrays.asList("1", "2","3"); List notRecruitList = Arrays.asList("0"); String annexType = dto.getAnnexType(); LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() .eq(!notRecruitList.contains(annexType),Annex::getRecruitId, byId.getRecruitId()) .eq(Annex::getUserId, dto.getUserId()) .eq(Annex::getUserType, WGZ) - .eq(Annex::getRecruitApplyId, dto.getRecruitApplyId()) + .eq(list.contains(annexType),Annex::getRecruitApplyId, dto.getRecruitApplyId()) .eq(!"3".equals(annexType), Annex::getAnnexType, annexType) .in("3".equals(annexType), Annex::getAnnexType, list); Page result = iAnnexService.page(PageUtils.buildPage(), wrapper); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectTaskController.java index 0434595..c7a2277 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectTaskController.java @@ -1,6 +1,9 @@ package com.ruoyi.web.controller.fbs; import cn.hutool.core.bean.BeanUtil; +import com.ruoyi.bgt.domain.dto.BgtProjectTaskUserDTO; +import com.ruoyi.bgt.domain.vo.BgtProjectRecruitApplyVO; +import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService; import com.ruoyi.bgt.service.IBgtUserService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -14,6 +17,7 @@ import com.ruoyi.fbs.domain.FbsProjectTask; import com.ruoyi.fbs.domain.dto.FbsProjectTaskUpdateDTO; import com.ruoyi.fbs.domain.dto.FbsTaskApplyListDTO; import com.ruoyi.fbs.domain.dto.FbsTaskListDTO; +import com.ruoyi.fbs.domain.dto.FbsTaskSwitchListDTO; import com.ruoyi.fbs.domain.vo.*; import com.ruoyi.fbs.service.IFbsProjectTaskApplyService; import com.ruoyi.fbs.service.IFbsProjectTaskService; @@ -41,6 +45,7 @@ public class AppFbsProjectTaskController extends BaseController { private final IFbsProjectTaskService iFbsProjectTaskService; private final IFbsProjectTaskApplyService iFbsProjectTaskApplyService; private final IBgtUserService iBgtUserService; + private final IBgtProjectRecruitApplyService iBgtProjectRecruitApplyService; @ApiOperation("分包商发布任务") @Log(title = "分包商发布任务", businessType = BusinessType.INSERT) @@ -107,4 +112,16 @@ public class AppFbsProjectTaskController extends BaseController { return AjaxResult.success(iFbsProjectTaskService.fbsWage(id)); } + @ApiOperation("分包商查询任务详情-务工人员数量") + @GetMapping("/wgzList") + public TableDataInfo fbsWgzList(@Validated BgtProjectTaskUserDTO dto) { + return iBgtProjectRecruitApplyService.fbsTaskUserList(dto); + } + + @ApiOperation("分包商查询任务详情-任务切换列表") + @GetMapping("/switchList") + public TableDataInfo switchList(FbsTaskSwitchListDTO dto) { + return iFbsProjectTaskService.switchList(dto); + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectTaskProgressController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectTaskProgressController.java new file mode 100644 index 0000000..857c78b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectTaskProgressController.java @@ -0,0 +1,65 @@ +package com.ruoyi.web.controller.fbs; + +import cn.hutool.core.bean.BeanUtil; +import com.ruoyi.bgt.domain.BgtProjectTaskProgress; +import com.ruoyi.bgt.domain.dto.BgtProjectTaskProgressQueryDTO; +import com.ruoyi.bgt.domain.vo.BgtProjectTaskProgressDetailVO; +import com.ruoyi.bgt.domain.vo.BgtProjectTaskProgressVO; +import com.ruoyi.bgt.service.IBgtProjectTaskProgressService; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.annotation.RepeatSubmit; +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.enums.BusinessType; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.fbs.domain.dto.FbsProjectTaskProgressAuditDTO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotNull; + +/** + * 包工头项目任务进度Controller + * + * @author ruoyi + * @date 2025-02-18 + */ +@Api(value = "App分包商项目任务进度控制器", tags = {"App分包商"}) +@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RestController +@RequestMapping("/app/fbs/progress") +public class AppFbsProjectTaskProgressController extends BaseController { + + private final IBgtProjectTaskProgressService iBgtProjectTaskProgressService; + + + @ApiOperation("分包商查询项目任务进度列表") + @GetMapping("/list") + public TableDataInfo list(@Validated BgtProjectTaskProgressQueryDTO bo) { + bo.setReviewerId(SecurityUtils.getAppUserId()); + return iBgtProjectTaskProgressService.appQueryPageList(bo); + } + + + @ApiOperation("分包商查询项目任务进度详细信息") + @GetMapping("/{id}") + public AjaxResult getInfo(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + return AjaxResult.success(iBgtProjectTaskProgressService.appQueryById(id)); + } + + @ApiOperation("分包商审核任务进度") + @Log(title = "分包商审核任务进度", businessType = BusinessType.UPDATE) + @RepeatSubmit + @PutMapping() + public AjaxResult edit(@Validated @RequestBody FbsProjectTaskProgressAuditDTO dto) { + BgtProjectTaskProgress bo = BeanUtil.copyProperties(dto, BgtProjectTaskProgress.class); + return AjaxResult.success(iBgtProjectTaskProgressService.update(bo)); + } + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectTaskProgress.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectTaskProgress.java index 822f715..d0be008 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectTaskProgress.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectTaskProgress.java @@ -111,6 +111,12 @@ public class BgtProjectTaskProgress implements Serializable { @ApiModelProperty("审核人Id") private Long reviewerId; + @ApiModelProperty("审核人名字") + private String reviewerName; + + @ApiModelProperty("审核意见") + private String auditOpinion; + /** 删除标志（0代表存在 2代表删除） */ @Excel(name = "删除标志" , readConverterExp = "0=代表存在,2=代表删除") @ApiModelProperty("删除标志（0代表存在 2代表删除）") diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtProjectTaskProgressQueryDTO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtProjectTaskProgressQueryDTO.java index a172b58..9312d97 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtProjectTaskProgressQueryDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtProjectTaskProgressQueryDTO.java @@ -29,6 +29,9 @@ public class BgtProjectTaskProgressQueryDTO { @ApiModelProperty(value = "上传人Id",hidden = true) private Long uploaderId; + @ApiModelProperty(value = "审核人Id",hidden = true) + private Long reviewerId; + @ApiModelProperty("任务ID") private Long taskId; diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/mapper/BgtProjectRecruitApplyMapper.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/mapper/BgtProjectRecruitApplyMapper.java index 534015c..ee7d48d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/mapper/BgtProjectRecruitApplyMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/mapper/BgtProjectRecruitApplyMapper.java @@ -41,12 +41,15 @@ public interface BgtProjectRecruitApplyMapper extends BaseMapperPlus underwayPage (@Param("page") Page page,@Param("req") WgzAppUnderwayReq req); - // 我的招工任务详情-务工者申请列表分页 + // 包工头 我的招工任务详情-务工者申请列表分页 Page recruitApplyList(@Param("page")Page queryDTOPage,@Param("dto") BgtProjectRecruitApplyUserDTO dto); - // 我的任务详情-务工者人员列表分页 + // 包工头 我的任务详情-务工者人员列表分页 Page taskUserList(@Param("page")Page queryDTOPage, @Param("dto") BgtProjectTaskUserDTO dto); + // 分包商 任务详情-务工者人员列表分页 + Page fbsTaskUserList(@Param("page")Page queryDTOPage, @Param("dto") BgtProjectTaskUserDTO dto); + /** * 获取指定用户的所有招工 * @param userId 用户id diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/IBgtProjectRecruitApplyService.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/IBgtProjectRecruitApplyService.java index 544f1d3..52dbfa0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/IBgtProjectRecruitApplyService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/IBgtProjectRecruitApplyService.java @@ -67,15 +67,20 @@ public interface IBgtProjectRecruitApplyService extends IServicePlus recruitApplyList(BgtProjectRecruitApplyUserDTO dto); /** - * 我的任务详情-务工者人员列表分页 + * 包工头 我的任务详情-务工者人员列表分页 */ TableDataInfo taskUserList(BgtProjectTaskUserDTO dto); + /** + * 分包商 查询任务详情-务工人员数量 + */ + TableDataInfo fbsTaskUserList(BgtProjectTaskUserDTO dto); + /** * 查询列表 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java index 06f850d..b6e6225 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java @@ -198,6 +198,15 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl fbsTaskUserList(BgtProjectTaskUserDTO dto) { + Page queryDTOPage = new Page<>(); + queryDTOPage.setCurrent(dto.getPageNum()); + queryDTOPage.setSize(dto.getPageSize()); + Page queryVOPage = baseMapper.fbsTaskUserList(queryDTOPage, dto); + return PageUtils.buildDataInfo(queryVOPage); + } + @Override public List appAllList(BgtProjectRecruitApplyQueryDTO dto) { if (dto.getTaskId() != null) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectTaskProgressServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectTaskProgressServiceImpl.java index 1c564b0..721bc7f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectTaskProgressServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectTaskProgressServiceImpl.java @@ -115,7 +115,6 @@ public class BgtProjectTaskProgressServiceImpl extends ServicePlusImpl queryDTOPage = new Page<>(); queryDTOPage.setCurrent(dto.getPageNum()); queryDTOPage.setSize(dto.getPageSize()); - dto.setUploaderId(SecurityUtils.getAppUserId()); Page queryVOPage = baseMapper.appQueryPageList(queryDTOPage, dto); return PageUtils.buildDataInfo(queryVOPage); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/dto/FbsProjectTaskProgressAuditDTO.java b/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/dto/FbsProjectTaskProgressAuditDTO.java new file mode 100644 index 0000000..72ac13c --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/dto/FbsProjectTaskProgressAuditDTO.java @@ -0,0 +1,31 @@ +package com.ruoyi.fbs.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +/** + * 工资结算分页查询对象 wgz_pay_calculation + * + * @author ruoyi + * @date 2025-02-21 + */ + +@Data +@NoArgsConstructor +@Accessors(chain = true) +@ApiModel("分包商工资结算审核对象") +public class FbsProjectTaskProgressAuditDTO { + + @ApiModelProperty("主键自增ID") + private Long id; + + @ApiModelProperty("审核状态（1审核中 2已审核 3未审核）") + private String auditStatus; + + @ApiModelProperty("审核意见") + private String auditOpinion; + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/dto/FbsTaskSwitchListDTO.java b/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/dto/FbsTaskSwitchListDTO.java new file mode 100644 index 0000000..5b5f227 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/fbs/domain/dto/FbsTaskSwitchListDTO.java @@ -0,0 +1,19 @@ +package com.ruoyi.fbs.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel("分包商任务切换列表查询条件") +public class FbsTaskSwitchListDTO { + @ApiModelProperty("分页大小") + private Integer pageSize; + /** 当前页数 */ + @ApiModelProperty("当前页数") + private Integer pageNum; + + @ApiModelProperty("任务名") + private String taskName; + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/fbs/service/IFbsProjectTaskService.java b/ruoyi-system/src/main/java/com/ruoyi/fbs/service/IFbsProjectTaskService.java index 46cfb1f..32b2e5f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/fbs/service/IFbsProjectTaskService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/fbs/service/IFbsProjectTaskService.java @@ -11,6 +11,7 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.fbs.bo.FbsProjectTaskQueryBo; import com.ruoyi.fbs.domain.FbsProjectTask; import com.ruoyi.fbs.domain.dto.FbsTaskListDTO; +import com.ruoyi.fbs.domain.dto.FbsTaskSwitchListDTO; import com.ruoyi.fbs.domain.vo.*; import java.util.Collection; @@ -116,7 +117,13 @@ public interface IFbsProjectTaskService extends IServicePlus { TableDataInfo fbsPageList(FbsTaskListDTO dto); /** - * 任务详情-结算 + * 分包商查询任务详情-工资结算审批 */ FbsTaskDetailWageVO fbsWage(Long id); + + /** + * 分包商查询任务详情-任务切换列表 + */ + TableDataInfo switchList(FbsTaskSwitchListDTO dto); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskServiceImpl.java index afa3cfb..30b95af 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskServiceImpl.java @@ -28,6 +28,7 @@ import com.ruoyi.fbs.bo.FbsProjectTaskQueryBo; import com.ruoyi.fbs.domain.FbsProjectTask; import com.ruoyi.fbs.domain.dto.FbsTaskApplyListDTO; import com.ruoyi.fbs.domain.dto.FbsTaskListDTO; +import com.ruoyi.fbs.domain.dto.FbsTaskSwitchListDTO; import com.ruoyi.fbs.domain.vo.*; import com.ruoyi.fbs.mapper.FbsProjectTaskMapper; import com.ruoyi.fbs.service.IFbsProjectTaskApplyService; @@ -356,4 +357,20 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl switchList(FbsTaskSwitchListDTO dto) { + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(FbsProjectTask::getCreateId,SecurityUtils.getAppUserId()); + wrapper.like(StrUtil.isNotBlank(dto.getTaskName()),FbsProjectTask::getTaskName,dto.getTaskName()); + wrapper.orderByDesc(FbsProjectTask::getId); + Page page = page(PageUtils.buildPage(), wrapper); + + Page fbsProjectTaskListVOPage = new Page<>(); + fbsProjectTaskListVOPage.setTotal(page.getTotal()); + List fbsProjectTaskListVOS = BeanUtil.copyToList(page.getRecords(), FbsProjectTaskListVO.class); + fbsProjectTaskListVOPage.setRecords(fbsProjectTaskListVOS); + return PageUtils.buildDataInfo(fbsProjectTaskListVOPage); + } } diff --git a/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml b/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml index b6789dc..c085baa 100644 --- a/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml @@ -271,6 +271,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by bpra.create_time desc + +