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-03 11:42:05 +08:00
parent bd4b8f4b28
commit 7059394761
11 changed files with 116 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectController.java
View File

@ -3,6 +3,7 @@ package com.ruoyi.web.controller.fbs;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.fbs.domain.dto.FbsProgressListDTO;
import com.ruoyi.fbs.domain.dto.FbsProjectListDTO;
import com.ruoyi.fbs.domain.vo.*;
import com.ruoyi.zbf.service.IZbfProjectService;
@ -102,6 +103,12 @@ public class AppFbsProjectController extends BaseController {
return AjaxResult.success(zbfProjectService.fbsProgress(projectId));
}
@ApiOperation("分包商查询项目详情-用工进度列表")
@GetMapping("/progressList")
public TableDataInfo<FbsProgressListVO> fbsProgressList(FbsProgressListDTO dto) {
return zbfProjectService.fbsProgressList(dto);
}
@ApiOperation("分包商查询项目详情-结算情况")
@GetMapping("/wage")
public AjaxResult<FbsProjectTaskDetailWageVO> fbsWage(Long projectId) {

13
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsWageApplicationController.java
View File

@ -9,6 +9,7 @@ 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.ZbfUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.fbs.domain.FbsWageApplication;
@ -16,6 +17,9 @@ import com.ruoyi.fbs.domain.dto.FbsWageApplicationListDTO;
import com.ruoyi.fbs.domain.dto.FbsWageAuditDTO;
import com.ruoyi.fbs.domain.dto.FbsWageAuditListDTO;
import com.ruoyi.fbs.service.IFbsWageApplicationService;
import com.ruoyi.zbf.domain.ZbfProject;
import com.ruoyi.zbf.service.IZbfProjectService;
import com.ruoyi.zbf.service.IZbfUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@ -39,6 +43,8 @@ public class AppFbsWageApplicationController extends BaseController {
private final IFbsWageApplicationService iFbsWageApplicationService;
private final IBgtWageApplicationService iBgtWageApplicationService;
private final IZbfUserService iZbfUserService;
private final IZbfProjectService iZbfProjectService;
@ApiOperation("分包商查询自己的工资申请列表")
@GetMapping("/list")
@ -58,9 +64,10 @@ public class AppFbsWageApplicationController extends BaseController {
@RepeatSubmit
@PostMapping()
public AjaxResult<Boolean> add(@Validated @RequestBody FbsWageApplication bo) {
// ZbfProject byId = iZbfProjectService.getById(bo.getProjectId());
//
// bo.setReviewerName(byId.getUnitName())
ZbfProject project = iZbfProjectService.getById(bo.getProjectId());
ZbfUser zbfUser = iZbfUserService.selectUserByUserId(project.getUserId());
bo.setReviewerName(zbfUser.getUsername());
bo.setReviewerId(zbfUser.getUserId());
return AjaxResult.success(iFbsWageApplicationService.insert(bo));
}