总包方

2025-04-11 11:39:38 +08:00
parent f1814f781c
commit b52be6eeab
25 changed files with 410 additions and 71 deletions
--- 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);
    }

--- 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<AppTaskDetailVO> base(@NotNull(message = "主键不能为空")
+											@PathVariable("applyId") Long applyId) {
+		FbsProjectTaskApply byId = iFbsProjectTaskApplyService.getById(applyId);
+		return AjaxResult.success(iFbsProjectTaskService.appQueryById(byId.getTaskId()));
+	}
+
+	@ApiOperation("分包商查询消息任务详情-申请列表")
+	@GetMapping("/taskApplyList")
+	public TableDataInfo<FbsProjectTaskApplyListVO> 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);
+	}
+

 }
--- 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<BgtProjectRecruitApplyVO> fbsWgzList(@Validated  BgtProjectTaskUserDTO dto) {
+	public TableDataInfo<BgtProjectRecruitApplyVO> fbsWgzList(@Validated FbsProjectTaskUserDTO dto) {
 		return iBgtProjectRecruitApplyService.fbsTaskUserList(dto);
 	}

--- 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<AppTaskDetailVO> 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<FbsProjectTaskApplyListVO> taskApplyList(@Validated FbsTaskApplyListDTO dto) {
-		return iFbsProjectTaskApplyService.queryPageListByTaskId(dto);
-	}
-
-	@ApiOperation("分包商查询任务详情-包工头信息")
-	@GetMapping("/bgtInfo/{id}")
+	@ApiOperation("总包方查询任务详情-包工头信息")
+	@GetMapping("/bgtInfo/{taskId}")
 	public AjaxResult<BgtUser> 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<AppTaskDetailProgressVO> 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<FbsTaskDetailWageVO> fbsWage(@NotNull(message = "主键不能为空")
-														@PathVariable("id") Long id) {
-		return AjaxResult.success(iFbsProjectTaskService.fbsWage(id));
+	@ApiOperation("总包方查询任务详情-单个-工资结算审批")
+	@GetMapping("/wage/{taskId}")
+	public AjaxResult<FbsTaskDetailWageVO> taskWage(@NotNull(message = "主键不能为空")
+														@PathVariable("taskId") Long taskId) {
+		return AjaxResult.success(iFbsProjectTaskService.fbsWage(taskId));
 	}

-	@ApiOperation("分包商查询任务详情-务工人员数量")
+	@ApiOperation("总包方查询任务详情-单个-务工人员数量")
 	@GetMapping("/wgzList")
-	public TableDataInfo<BgtProjectRecruitApplyVO> fbsWgzList(@Validated  BgtProjectTaskUserDTO dto) {
+	public TableDataInfo<BgtProjectRecruitApplyVO> taskWgzList(@Validated FbsProjectTaskUserDTO dto) {
 		return iBgtProjectRecruitApplyService.fbsTaskUserList(dto);
 	}

-	@ApiOperation("分包商查询任务详情-任务切换列表")
-	@GetMapping("/switchList")
-	public TableDataInfo<FbsProjectTaskListVO> switchList(FbsTaskSwitchListDTO dto) {
-		return iFbsProjectTaskService.switchList(dto);
+	@ApiOperation("总包方查询任务详情-总和-任务进度")
+	@GetMapping("/progressAll")
+	public AjaxResult<ZbfProgressVO> progressAll(@Validated ZbfTaskAllDTO dto) {
+		return AjaxResult.success(iFbsProjectTaskService.progressAll(dto));
 	}

-	@ApiOperation("分包商查询包工头信息(点头像)")
+	@ApiOperation("总包方查询任务详情-总和-工资结算审批")
+	@GetMapping("/wageAll")
+	public AjaxResult<FbsTaskDetailWageVO> taskWageAll(@Validated ZbfTaskAllDTO dto) {
+		return AjaxResult.success(iFbsProjectTaskService.taskWageAll(dto));
+	}
+
+	@ApiOperation("总包方查询任务详情-总和-务工人员数量")
+	@GetMapping("/wgzListAll")
+	public TableDataInfo<BgtProjectRecruitApplyVO> taskWgzListAll(@Validated ZbfProjectTaskUserDTO dto) {
+		return iBgtProjectRecruitApplyService.taskWgzListAll(dto);
+	}
+
+//	@ApiOperation("分包商查询任务详情-任务切换列表")
+//	@GetMapping("/switchList")
+//	public TableDataInfo<FbsProjectTaskListVO> switchList(FbsTaskSwitchListDTO dto) {
+//		return iFbsProjectTaskService.switchList(dto);
+//	}
+
+	@ApiOperation("总包方查询包工头信息(点头像)")
 	@GetMapping("/bgt/{userId}")
 	public AjaxResult<BgtUser> 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<FbsGetWgzUserInfoVO> 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<FbsProjectTask> bgtTaskList(ZbfProjectTaskDTO dto) {
+		return iFbsProjectTaskService.bgtTaskList(dto);
+	}
 }