From b52be6eeab9d25268eb231a705cfdc637a7246f4 Mon Sep 17 00:00:00 2001 From: zt Date: Fri, 11 Apr 2025 11:39:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E5=8C=85=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...AppFbsProjectSubcontractingController.java | 3 + .../fbs/AppFbsProjectTaskApplyController.java | 27 ++++++ .../fbs/AppFbsProjectTaskController.java | 8 +- .../zbf/AppZbfProjectTaskController.java | 89 +++++++++++-------- .../mapper/BgtProjectRecruitApplyMapper.java | 7 +- .../IBgtProjectRecruitApplyService.java | 11 ++- .../BgtProjectRecruitApplyServiceImpl.java | 15 +++- .../BgtProjectTaskProgressServiceImpl.java | 22 ++--- .../impl/BgtWageApplicationServiceImpl.java | 3 +- .../dto/FbsMessageTaskApplyListDTO.java | 25 ++++++ .../fbs/domain/dto/FbsProjectTaskUserDTO.java | 28 ++++++ .../domain/vo/AppTaskDetailProgressVO.java | 2 +- .../fbs/domain/vo/FbsProjectDetailVO.java | 3 + .../vo/FbsProjectSubcontractingDetailVO.java | 3 + .../vo/FbsProjectTaskDetailProgressVO.java | 3 + .../fbs/service/IFbsProjectTaskService.java | 19 ++++ .../impl/FbsProjectTaskApplyServiceImpl.java | 18 +++- .../impl/FbsProjectTaskServiceImpl.java | 62 +++++++++++++ .../zbf/domain/dto/ZbfProjectTaskDTO.java | 26 ++++++ .../zbf/domain/dto/ZbfProjectTaskUserDTO.java | 32 +++++++ .../ruoyi/zbf/domain/dto/ZbfTaskAllDTO.java | 20 +++++ .../service/impl/ZbfProjectServiceImpl.java | 4 + ...ProjectSubcontractingApplyServiceImpl.java | 11 ++- .../bgt/BgtProjectRecruitApplyMapper.xml | 33 +++++++ .../resources/mapper/zbf/ZbfProjectMapper.xml | 7 +- 25 files changed, 410 insertions(+), 71 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/fbs/domain/dto/FbsMessageTaskApplyListDTO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/fbs/domain/dto/FbsProjectTaskUserDTO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfProjectTaskDTO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfProjectTaskUserDTO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfTaskAllDTO.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectSubcontractingController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectSubcontractingController.java index 866eb38..88f4009 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectSubcontractingController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectSubcontractingController.java @@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.fbs.domain.vo.FbsProjectSubcontractingDetailVO; import com.ruoyi.zbf.domain.ZbfProjectSubcontracting; import com.ruoyi.zbf.service.IZbfProjectSectionService; +import com.ruoyi.zbf.service.IZbfProjectService; import com.ruoyi.zbf.service.IZbfProjectSubcontractingService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -32,6 +33,7 @@ public class AppFbsProjectSubcontractingController extends BaseController { private final IZbfProjectSubcontractingService iZbfProjectSubcontractingService; private final IZbfProjectSectionService zbfProjectSectionService; + private final IZbfProjectService zbfProjectService; @ApiOperation("分包商查询项目分包详细信息") @GetMapping("/{id}") @@ -40,6 +42,7 @@ public class AppFbsProjectSubcontractingController extends BaseController { ZbfProjectSubcontracting zbfProjectSubcontracting = iZbfProjectSubcontractingService.queryById(id); FbsProjectSubcontractingDetailVO vo = BeanUtil.copyProperties(zbfProjectSubcontracting, FbsProjectSubcontractingDetailVO.class); vo.setSectionName(zbfProjectSectionService.getById(vo.getSectionId()).getSectionName()); + vo.setProjectImg(zbfProjectService.getById(vo.getProjectId()).getProjectImg()); return AjaxResult.success(vo); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectTaskApplyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectTaskApplyController.java index 673940d..dc740ae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectTaskApplyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectTaskApplyController.java @@ -1,15 +1,24 @@ package com.ruoyi.web.controller.fbs; +import cn.hutool.core.bean.BeanUtil; 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.fbs.domain.FbsProjectTaskApply; +import com.ruoyi.fbs.domain.dto.FbsMessageTaskApplyListDTO; +import com.ruoyi.fbs.domain.dto.FbsTaskApplyListDTO; +import com.ruoyi.fbs.domain.vo.AppTaskDetailVO; +import com.ruoyi.fbs.domain.vo.FbsProjectTaskApplyListVO; import com.ruoyi.fbs.service.IFbsProjectTaskApplyService; +import com.ruoyi.fbs.service.IFbsProjectTaskService; 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; @@ -27,6 +36,7 @@ import javax.validation.constraints.NotNull; public class AppFbsProjectTaskApplyController extends BaseController { private final IFbsProjectTaskApplyService iFbsProjectTaskApplyService; + private final IFbsProjectTaskService iFbsProjectTaskService; @ApiOperation("分包商选择包工头") @@ -38,5 +48,22 @@ public class AppFbsProjectTaskApplyController extends BaseController { return AjaxResult.success(iFbsProjectTaskApplyService.choose(id)); } + @ApiOperation("分包商查询消息任务详情-基础信息") + @GetMapping("/base/{applyId}") + public AjaxResult base(@NotNull(message = "主键不能为空") + @PathVariable("applyId") Long applyId) { + FbsProjectTaskApply byId = iFbsProjectTaskApplyService.getById(applyId); + return AjaxResult.success(iFbsProjectTaskService.appQueryById(byId.getTaskId())); + } + + @ApiOperation("分包商查询消息任务详情-申请列表") + @GetMapping("/taskApplyList") + public TableDataInfo taskApplyList(@Validated FbsMessageTaskApplyListDTO dto) { + FbsTaskApplyListDTO fbsTaskApplyListDTO = BeanUtil.copyProperties(dto, FbsTaskApplyListDTO.class); + FbsProjectTaskApply byId = iFbsProjectTaskApplyService.getById(dto.getTaskApplyId()); + fbsTaskApplyListDTO.setTaskId(byId.getTaskId()); + return iFbsProjectTaskApplyService.queryPageListByTaskId(fbsTaskApplyListDTO); + } + } 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 91cd15e..63e3ebf 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 @@ -2,7 +2,6 @@ package com.ruoyi.web.controller.fbs; import cn.hutool.core.bean.BeanUtil; import com.ruoyi.bgt.domain.BgtProjectRecruitApply; -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; @@ -18,10 +17,7 @@ import com.ruoyi.common.service.ICompanyService; import com.ruoyi.common.util.DataUtil; import com.ruoyi.common.utils.SecurityUtils; 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.dto.*; import com.ruoyi.fbs.domain.vo.*; import com.ruoyi.fbs.service.IFbsProjectTaskApplyService; import com.ruoyi.fbs.service.IFbsProjectTaskService; @@ -138,7 +134,7 @@ public class AppFbsProjectTaskController extends BaseController { @ApiOperation("分包商查询任务详情-务工人员数量") @GetMapping("/wgzList") - public TableDataInfo fbsWgzList(@Validated BgtProjectTaskUserDTO dto) { + public TableDataInfo fbsWgzList(@Validated FbsProjectTaskUserDTO dto) { return iBgtProjectRecruitApplyService.fbsTaskUserList(dto); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zbf/AppZbfProjectTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zbf/AppZbfProjectTaskController.java index f33e0d3..8f4fa2c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zbf/AppZbfProjectTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zbf/AppZbfProjectTaskController.java @@ -2,7 +2,6 @@ package com.ruoyi.web.controller.zbf; import cn.hutool.core.bean.BeanUtil; import com.ruoyi.bgt.domain.BgtProjectRecruitApply; -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; @@ -14,10 +13,8 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.service.ICompanyService; import com.ruoyi.common.util.DataUtil; import com.ruoyi.fbs.domain.FbsProjectTask; -import com.ruoyi.fbs.domain.dto.FbsTaskApplyListDTO; -import com.ruoyi.fbs.domain.dto.FbsTaskSwitchListDTO; +import com.ruoyi.fbs.domain.dto.FbsProjectTaskUserDTO; import com.ruoyi.fbs.domain.vo.*; -import com.ruoyi.fbs.service.IFbsProjectTaskApplyService; import com.ruoyi.fbs.service.IFbsProjectTaskService; import com.ruoyi.fbs.service.IFbsUserService; import com.ruoyi.wgz.domain.WgzUser; @@ -25,6 +22,10 @@ import com.ruoyi.wgz.service.IWgzUserService; import com.ruoyi.zbf.domain.ZbfProject; import com.ruoyi.zbf.domain.ZbfProjectSection; import com.ruoyi.zbf.domain.ZbfProjectSubcontracting; +import com.ruoyi.zbf.domain.dto.ZbfProjectTaskDTO; +import com.ruoyi.zbf.domain.dto.ZbfProjectTaskUserDTO; +import com.ruoyi.zbf.domain.dto.ZbfTaskAllDTO; +import com.ruoyi.zbf.domain.vo.ZbfProgressVO; import com.ruoyi.zbf.service.IZbfProjectSectionService; import com.ruoyi.zbf.service.IZbfProjectService; import com.ruoyi.zbf.service.IZbfProjectSubcontractingService; @@ -53,7 +54,6 @@ import javax.validation.constraints.NotNull; public class AppZbfProjectTaskController extends BaseController { private final IFbsProjectTaskService iFbsProjectTaskService; - private final IFbsProjectTaskApplyService iFbsProjectTaskApplyService; private final IBgtUserService iBgtUserService; private final IBgtProjectRecruitApplyService iBgtProjectRecruitApplyService; private final IWgzUserService iWgzUserService; @@ -63,24 +63,18 @@ public class AppZbfProjectTaskController extends BaseController { private final IFbsUserService iFbsUserService; private final ICompanyService iCompanyService; - @ApiOperation("分包商查询任务详情-基础信息") - @GetMapping("/base/{id}") + @ApiOperation("总包方查询任务详情-基础信息") + @GetMapping("/base/{taskId}") public AjaxResult base(@NotNull(message = "主键不能为空") - @PathVariable("id") Long id) { - return AjaxResult.success(iFbsProjectTaskService.appQueryById(id)); + @PathVariable("taskId") Long taskId) { + return AjaxResult.success(iFbsProjectTaskService.appQueryById(taskId)); } - @ApiOperation("分包商查询任务详情-申请列表") - @GetMapping("/taskApplyList") - public TableDataInfo taskApplyList(@Validated FbsTaskApplyListDTO dto) { - return iFbsProjectTaskApplyService.queryPageListByTaskId(dto); - } - - @ApiOperation("分包商查询任务详情-包工头信息") - @GetMapping("/bgtInfo/{id}") + @ApiOperation("总包方查询任务详情-包工头信息") + @GetMapping("/bgtInfo/{taskId}") public AjaxResult bgtInfo(@NotNull(message = "主键不能为空") - @PathVariable("id") Long id) { - FbsProjectTask task = iFbsProjectTaskService.getById(id); + @PathVariable("taskId") Long taskId) { + FbsProjectTask task = iFbsProjectTaskService.getById(taskId); if(task!=null&&task.getUserId()!=null){ BgtUser bgtUser = iBgtUserService.selectUserByUserId(task.getUserId()); return AjaxResult.success(bgtUser); @@ -88,34 +82,52 @@ public class AppZbfProjectTaskController extends BaseController { return AjaxResult.success(new BgtUser()); } - @ApiOperation("分包商查询任务详情-任务进度") - @GetMapping("/progress/{id}") + @ApiOperation("总包方查询任务详情-单个-任务进度") + @GetMapping("/progress/{taskId}") public AjaxResult progress(@NotNull(message = "主键不能为空") - @PathVariable("id") Long id) { - return AjaxResult.success(iFbsProjectTaskService.progress(id)); + @PathVariable("taskId") Long taskId) { + return AjaxResult.success(iFbsProjectTaskService.progress(taskId)); } - @ApiOperation("分包商查询任务详情-工资结算审批") - @GetMapping("/wage/{id}") - public AjaxResult fbsWage(@NotNull(message = "主键不能为空") - @PathVariable("id") Long id) { - return AjaxResult.success(iFbsProjectTaskService.fbsWage(id)); + @ApiOperation("总包方查询任务详情-单个-工资结算审批") + @GetMapping("/wage/{taskId}") + public AjaxResult taskWage(@NotNull(message = "主键不能为空") + @PathVariable("taskId") Long taskId) { + return AjaxResult.success(iFbsProjectTaskService.fbsWage(taskId)); } - @ApiOperation("分包商查询任务详情-务工人员数量") + @ApiOperation("总包方查询任务详情-单个-务工人员数量") @GetMapping("/wgzList") - public TableDataInfo fbsWgzList(@Validated BgtProjectTaskUserDTO dto) { + public TableDataInfo taskWgzList(@Validated FbsProjectTaskUserDTO dto) { return iBgtProjectRecruitApplyService.fbsTaskUserList(dto); } - @ApiOperation("分包商查询任务详情-任务切换列表") - @GetMapping("/switchList") - public TableDataInfo switchList(FbsTaskSwitchListDTO dto) { - return iFbsProjectTaskService.switchList(dto); + @ApiOperation("总包方查询任务详情-总和-任务进度") + @GetMapping("/progressAll") + public AjaxResult progressAll(@Validated ZbfTaskAllDTO dto) { + return AjaxResult.success(iFbsProjectTaskService.progressAll(dto)); } - @ApiOperation("分包商查询包工头信息(点头像)") + @ApiOperation("总包方查询任务详情-总和-工资结算审批") + @GetMapping("/wageAll") + public AjaxResult taskWageAll(@Validated ZbfTaskAllDTO dto) { + return AjaxResult.success(iFbsProjectTaskService.taskWageAll(dto)); + } + + @ApiOperation("总包方查询任务详情-总和-务工人员数量") + @GetMapping("/wgzListAll") + public TableDataInfo taskWgzListAll(@Validated ZbfProjectTaskUserDTO dto) { + return iBgtProjectRecruitApplyService.taskWgzListAll(dto); + } + +// @ApiOperation("分包商查询任务详情-任务切换列表") +// @GetMapping("/switchList") +// public TableDataInfo switchList(FbsTaskSwitchListDTO dto) { +// return iFbsProjectTaskService.switchList(dto); +// } + + @ApiOperation("总包方查询包工头信息(点头像)") @GetMapping("/bgt/{userId}") public AjaxResult bgt(@NotNull(message = "主键不能为空") @PathVariable("userId") Long userId) { @@ -124,7 +136,7 @@ public class AppZbfProjectTaskController extends BaseController { return AjaxResult.success(bgtUser); } - @ApiOperation("分包商查询务工者信息") + @ApiOperation("总包方查询务工者信息") @GetMapping("/wgzInfo") public AjaxResult getWgzUserInfo(Long userId, Long recruitApplyId) { WgzUser byUserId = iWgzUserService.findByUserId(userId); @@ -146,4 +158,9 @@ public class AppZbfProjectTaskController extends BaseController { return AjaxResult.success(vo); } + @ApiOperation("总包方查询任务详情-包工头任务列表") + @GetMapping("/bgtTaskList") + public TableDataInfo bgtTaskList(ZbfProjectTaskDTO dto) { + return iFbsProjectTaskService.bgtTaskList(dto); + } } 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 ee7d48d..1eb4d60 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 @@ -9,9 +9,11 @@ import com.ruoyi.bgt.domain.dto.BgtProjectTaskUserDTO; import com.ruoyi.bgt.domain.vo.BgtProjectRecruitApplyVO; import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache; import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; +import com.ruoyi.fbs.domain.dto.FbsProjectTaskUserDTO; import com.ruoyi.wgz.bo.req.WgzAppUnderwayReq; import com.ruoyi.wgz.bo.res.WgzAppUnderwayRes; import com.ruoyi.wgz.bo.rests.WgzAppUserAllRecruitmentTwo; +import com.ruoyi.zbf.domain.dto.ZbfProjectTaskUserDTO; import org.apache.ibatis.annotations.CacheNamespace; import org.apache.ibatis.annotations.Param; @@ -48,7 +50,10 @@ public interface BgtProjectRecruitApplyMapper extends BaseMapperPlus taskUserList(@Param("page")Page queryDTOPage, @Param("dto") BgtProjectTaskUserDTO dto); // 分包商 任务详情-务工者人员列表分页 - Page fbsTaskUserList(@Param("page")Page queryDTOPage, @Param("dto") BgtProjectTaskUserDTO dto); + Page fbsTaskUserList(@Param("page")Page queryDTOPage, @Param("dto") FbsProjectTaskUserDTO dto); + + // 总包方 查询任务详情-务工人员数量-所有 + Page taskWgzListAll(@Param("page")Page queryDTOPage, @Param("dto") ZbfProjectTaskUserDTO dto); /** * 获取指定用户的所有招工 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 52dbfa0..b112122 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 @@ -6,10 +6,12 @@ import com.ruoyi.bgt.domain.dto.*; import com.ruoyi.bgt.domain.vo.BgtProjectRecruitApplyVO; import com.ruoyi.common.core.mybatisplus.core.IServicePlus; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.fbs.domain.dto.FbsProjectTaskUserDTO; import com.ruoyi.wgz.bo.req.WgzAppConfirmRegistrationReq; import com.ruoyi.wgz.bo.req.WgzAppUnderwayReq; import com.ruoyi.wgz.bo.res.WgzAppUnderwayRes; import com.ruoyi.wgz.bo.rests.WgzAppUserAllRecruitmentTwo; +import com.ruoyi.zbf.domain.dto.ZbfProjectTaskUserDTO; import org.springframework.validation.annotation.Validated; import java.util.Collection; @@ -79,7 +81,14 @@ public interface IBgtProjectRecruitApplyService extends IServicePlus fbsTaskUserList(BgtProjectTaskUserDTO dto); + TableDataInfo fbsTaskUserList(FbsProjectTaskUserDTO dto); + + /** + * 总包方 查询任务详情-务工人员数量-所有 + */ + TableDataInfo taskWgzListAll(ZbfProjectTaskUserDTO 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 b6e6225..cec5f64 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 @@ -28,6 +28,7 @@ import com.ruoyi.common.service.IAsyncService; import com.ruoyi.common.service.IWgzService; import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.fbs.domain.dto.FbsProjectTaskUserDTO; import com.ruoyi.system.service.ISysDictTypeService; import com.ruoyi.wgz.bo.req.WgzAppConfirmRegistrationReq; import com.ruoyi.wgz.bo.req.WgzAppUnderwayReq; @@ -38,6 +39,7 @@ import com.ruoyi.wgz.domain.WgzMessage; import com.ruoyi.wgz.domain.WgzScoreRecord; import com.ruoyi.wgz.domain.WgzUser; import com.ruoyi.wgz.service.*; +import com.ruoyi.zbf.domain.dto.ZbfProjectTaskUserDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; @@ -199,14 +201,23 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl fbsTaskUserList(BgtProjectTaskUserDTO dto) { - Page queryDTOPage = new Page<>(); + public TableDataInfo fbsTaskUserList(FbsProjectTaskUserDTO 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 TableDataInfo taskWgzListAll(ZbfProjectTaskUserDTO dto) { + Page queryDTOPage = new Page<>(); + queryDTOPage.setCurrent(dto.getPageNum()); + queryDTOPage.setSize(dto.getPageSize()); + Page queryVOPage = baseMapper.taskWgzListAll(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 834a39d..28c6c4c 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 @@ -19,6 +19,7 @@ import com.ruoyi.bgt.service.IBgtProjectTaskProgressService; import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.AuditStatus; +import com.ruoyi.common.enums.ProjectTaskStatus; import com.ruoyi.common.exception.BaseException; import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.SecurityUtils; @@ -29,7 +30,10 @@ import com.ruoyi.fbs.service.IFbsProjectTaskService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static com.ruoyi.common.constants.BgtMessageConstant.*; import static com.ruoyi.common.constants.FbsMessageConstant.*; @@ -88,15 +92,6 @@ public class BgtProjectTaskProgressServiceImpl extends ServicePlusImpl mp = new HashMap<>(); mp.put("projectName", task.getTaskName()); diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtWageApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtWageApplicationServiceImpl.java index abbe1f9..081b1b1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtWageApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtWageApplicationServiceImpl.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.ruoyi.bgt.bo.BgtWageApplicationQueryBo; import com.ruoyi.bgt.domain.BgtMessage; -import com.ruoyi.bgt.domain.BgtProjectTaskProgress; import com.ruoyi.bgt.domain.BgtWageApplication; import com.ruoyi.bgt.domain.dto.BgtWageApplicationQueryDTO; import com.ruoyi.bgt.domain.vo.BgtWageApplicationDetailVO; @@ -233,7 +232,7 @@ public class BgtWageApplicationServiceImpl extends ServicePlusImpl { */ AppTaskDetailProgressVO progress(Long id); + /** + * 任务详情-进度-包工头总和 + */ + ZbfProgressVO progressAll(ZbfTaskAllDTO dto); + /** * 任务详情-结算 */ @@ -126,9 +134,20 @@ public interface IFbsProjectTaskService extends IServicePlus { */ FbsTaskDetailWageVO fbsWage(Long id); + /** + * 总包方查询任务详情-工资结算审批-总和 + */ + FbsTaskDetailWageVO taskWageAll(ZbfTaskAllDTO dto); + /** * 分包商查询任务详情-任务切换列表 */ TableDataInfo switchList(FbsTaskSwitchListDTO dto); + /** + * 总包方查询任务详情-包工头任务列表 + */ + TableDataInfo bgtTaskList(ZbfProjectTaskDTO dto); + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskApplyServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskApplyServiceImpl.java index 04fe7f6..141f27c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskApplyServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskApplyServiceImpl.java @@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.ruoyi.bgt.domain.BgtMessage; import com.ruoyi.bgt.domain.dto.BgtTaskApplyDTO; import com.ruoyi.bgt.service.IBgtMessageService; +import com.ruoyi.bgt.service.IBgtUserService; +import com.ruoyi.common.core.domain.entity.BgtUser; import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.TaskApplyStatus; @@ -52,6 +54,8 @@ public class FbsProjectTaskApplyServiceImpl extends ServicePlusImpl mp = new HashMap<>(); @@ -158,7 +168,7 @@ public class FbsProjectTaskApplyServiceImpl extends ServicePlusImpl list = fbsProjectTaskService.list(Wrappers.lambdaQuery() + .eq(FbsProjectTask::getSubId, dto.getSubId()) + .eq(FbsProjectTask::getUserId, dto.getBgtUserId()) + ); + List taskIds = list.stream().map(FbsProjectTask::getId).collect(Collectors.toList()); + List progressByTaskIds = progressService.getProgressByTaskIds(taskIds); + ZbfProgressVO zbfProgressVO = new ZbfProgressVO(); + Integer progress = progressByTaskIds.stream().mapToInt(BgtProjectTaskProgress::getProgress).sum(); + zbfProgressVO.setProgress(progress); + zbfProgressVO.setTotalProgress(taskIds.size() * 100); + return zbfProgressVO; + } + @Override public BgtTaskDetailWageVO wage(Long id) { FbsProjectTask task = getById(id); @@ -377,6 +400,34 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl list = fbsProjectTaskService.list(Wrappers.lambdaQuery() + .eq(FbsProjectTask::getSubId, dto.getSubId()) + .eq(FbsProjectTask::getUserId, dto.getBgtUserId()) + ); + vo.setTaskAmount(list.stream().map(FbsProjectTask::getTaskAmount).reduce(BigDecimal.ZERO, BigDecimal::add)); + List taskIds = list.stream().map(FbsProjectTask::getId).collect(Collectors.toList()); + + List wageList = wageApplicationService.list(Wrappers.lambdaQuery() + .in(BgtWageApplication::getTaskId, taskIds).orderByDesc(BgtWageApplication::getId)); + + vo.setWageApplication(BeanUtil.copyProperties(wageList.get(0), BgtWageApplicationListVO.class)); + BigDecimal taskAuditAmount = BigDecimal.ZERO; + BigDecimal taskApplyAmount= BigDecimal.ZERO; + for (BgtWageApplication wage : wageList) { + taskApplyAmount = taskApplyAmount.add(wage.getApplicantAmount()); + if(AuditStatus.PASS.getCode().equals(wage.getAuditStatus())){ + taskAuditAmount = taskAuditAmount.add(wage.getApplicantAmount()); + } + } + vo.setTaskAuditAmount(taskAuditAmount); + vo.setTaskApplyAmount(taskApplyAmount); + return vo; + } + @Override public TableDataInfo switchList(FbsTaskSwitchListDTO dto) { @@ -392,4 +443,15 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl bgtTaskList(ZbfProjectTaskDTO dto) { + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(FbsProjectTask::getSubId,dto.getSubId()); + wrapper.eq(FbsProjectTask::getUserId,dto.getBgtUserId()); + wrapper.orderByDesc(FbsProjectTask::getId); + Page page = page(PageUtils.buildPage(), wrapper); + return PageUtils.buildDataInfo(page); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfProjectTaskDTO.java b/ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfProjectTaskDTO.java new file mode 100644 index 0000000..3d5cd55 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfProjectTaskDTO.java @@ -0,0 +1,26 @@ +package com.ruoyi.zbf.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +@ApiModel("分包商项目切换列表查询条件") +public class ZbfProjectTaskDTO { + + @ApiModelProperty("分页大小") + private Integer pageSize; + /** 当前页数 */ + @ApiModelProperty("当前页数") + private Integer pageNum; + + @ApiModelProperty("分包ID") + @NotNull(message = "分包ID不能为空") + private Long subId; + + @ApiModelProperty("包工头用户Id") + @NotNull(message = "包工头用户Id不能为空") + private Long bgtUserId; +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfProjectTaskUserDTO.java b/ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfProjectTaskUserDTO.java new file mode 100644 index 0000000..a87e7d0 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfProjectTaskUserDTO.java @@ -0,0 +1,32 @@ +package com.ruoyi.zbf.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +@ApiModel("分包商任务详情务工者申请列表查询对象") +public class ZbfProjectTaskUserDTO { + + @ApiModelProperty("分页大小") + private Integer pageSize; + /** 当前页数 */ + @ApiModelProperty("当前页数") + private Integer pageNum; + + @ApiModelProperty("包工头用户ID") + @NotNull(message = "包工头用户ID不能为空") + private Long bgtUserId; + + @ApiModelProperty("分包ID") + @NotNull(message = "分包ID不能为空") + private Long subId; + + @ApiModelProperty("选择状态（5-进场，6-离场") + private Integer status; + + @ApiModelProperty("务工者名字") + private String username; +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfTaskAllDTO.java b/ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfTaskAllDTO.java new file mode 100644 index 0000000..f3d1976 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfTaskAllDTO.java @@ -0,0 +1,20 @@ +package com.ruoyi.zbf.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +@ApiModel("总包方项目分包查看包工头所有任务查询参数") +public class ZbfTaskAllDTO { + + @ApiModelProperty("包工头用户ID") + @NotNull(message = "包工头用户ID不能为空") + private Long bgtUserId; + + @ApiModelProperty("分包ID") + @NotNull(message = "分包ID不能为空") + private Long subId; +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/zbf/service/impl/ZbfProjectServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/zbf/service/impl/ZbfProjectServiceImpl.java index 71a2e8c..87ffe17 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/zbf/service/impl/ZbfProjectServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/zbf/service/impl/ZbfProjectServiceImpl.java @@ -514,6 +514,10 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl + +