zt/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zt
2025-04-18 14:45:08 +08:00
parent d6efd8c450
commit ddff49d08c
14 changed files with 278 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zbf/AppZbfProjectController.java
View File

@ -52,6 +52,13 @@ public class AppZbfProjectController extends BaseController {
public AjaxResult<Boolean> edit(@Validated @RequestBody ZbfProjectAddDTO dto) {
return AjaxResult.success(iZbfProjectService.edit(dto));
}
@ApiOperation("总包方获取编辑所需项目信息")
@GetMapping("/edit/{projectId}")
public AjaxResult<ZbfProjectUpdateVO> zbfEditInfo(@NotNull(message = "主键不能为空")
@PathVariable("projectId") Long projectId) {
return AjaxResult.success(iZbfProjectService.zbfEditInfo(projectId));
}
@ApiOperation("总包方查询我的项目列表")
@GetMapping("/list")

15
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zbf/AppZbfProjectTaskController.java
View File

@ -2,9 +2,11 @@ package com.ruoyi.web.controller.zbf;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.bgt.domain.BgtProjectRecruitApply;
import com.ruoyi.bgt.domain.BgtWageApplication;
import com.ruoyi.bgt.domain.vo.BgtProjectRecruitApplyVO;
import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService;
import com.ruoyi.bgt.service.IBgtUserService;
import com.ruoyi.bgt.service.IBgtWageApplicationService;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.BgtUser;
@ -14,7 +16,10 @@ import com.ruoyi.common.service.ICompanyService;
import com.ruoyi.common.util.DataUtil;
import com.ruoyi.fbs.domain.FbsProjectTask;
import com.ruoyi.fbs.domain.dto.FbsProjectTaskUserDTO;
import com.ruoyi.fbs.domain.vo.*;
import com.ruoyi.fbs.domain.vo.AppTaskDetailProgressVO;
import com.ruoyi.fbs.domain.vo.AppTaskDetailVO;
import com.ruoyi.fbs.domain.vo.FbsGetWgzUserInfoVO;
import com.ruoyi.fbs.domain.vo.FbsTaskDetailWageVO;
import com.ruoyi.fbs.service.IFbsProjectTaskService;
import com.ruoyi.fbs.service.IFbsUserService;
import com.ruoyi.wgz.domain.WgzUser;
@ -22,6 +27,7 @@ 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.ZbfGetBgtWageListDTO;
import com.ruoyi.zbf.domain.dto.ZbfProjectTaskDTO;
import com.ruoyi.zbf.domain.dto.ZbfProjectTaskUserDTO;
import com.ruoyi.zbf.domain.dto.ZbfTaskAllDTO;
@ -62,6 +68,7 @@ public class AppZbfProjectTaskController extends BaseController {
private final IZbfProjectSubcontractingService iZbfProjectSubcontractingService;
private final IFbsUserService iFbsUserService;
private final ICompanyService iCompanyService;
private final IBgtWageApplicationService iBgtWageApplicationService;
@ApiOperation("总包方查询任务详情-基础信息")
@GetMapping("/base/{taskId}")
@ -97,6 +104,12 @@ public class AppZbfProjectTaskController extends BaseController {
return AjaxResult.success(iFbsProjectTaskService.fbsWage(taskId));
}
@ApiOperation("总包方查询任务详情-工资结算审批列表")
@GetMapping("/wageList")
public TableDataInfo<BgtWageApplication> taskWageList(@Validated ZbfGetBgtWageListDTO dto) {
return iBgtWageApplicationService.taskWageList(dto);
}
@ApiOperation("总包方查询任务详情-单个-务工人员数量")
@GetMapping("/wgzList")
public TableDataInfo<BgtProjectRecruitApplyVO> taskWgzList(@Validated FbsProjectTaskUserDTO dto) {