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 09:56:56 +08:00
parent bfc839fa8d
commit 6a6adcf8b2
26 changed files with 521 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskController.java
View File

@ -16,7 +16,9 @@ import com.ruoyi.common.exception.BaseException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.fbs.domain.FbsProjectTask;
import com.ruoyi.bgt.domain.dto.BgtTaskDTO;
import com.ruoyi.fbs.domain.FbsProjectTaskApply;
import com.ruoyi.fbs.domain.vo.*;
import com.ruoyi.fbs.service.IFbsProjectTaskApplyService;
import com.ruoyi.fbs.service.IFbsProjectTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -42,6 +44,8 @@ public class AppBgtProjectTaskController extends BaseController {
private final IFbsProjectTaskService iFbsProjectTaskService;
private final IFbsProjectTaskApplyService iFbsProjectTaskApplyService;
private final IBgtUserService bgtUserService;
/**
@ -68,7 +72,13 @@ public class AppBgtProjectTaskController extends BaseController {
@GetMapping("/{id}")
public AjaxResult<AppTaskDetailVO> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return AjaxResult.success(iFbsProjectTaskService.appQueryById(id));
AppTaskDetailVO appTaskDetailVO = iFbsProjectTaskService.appQueryById(id);
//申请状态
FbsProjectTaskApply applyByTaskId = iFbsProjectTaskApplyService.getApplyByTaskId(id);
if (applyByTaskId != null) {
appTaskDetailVO.setApplyStatus(applyByTaskId.getApplyStatus());
}
return AjaxResult.success(appTaskDetailVO);
}
@ApiOperation("项目任务详细信息-考勤")

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

@ -4,13 +4,12 @@ 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.FbsProjectListDTO;
import com.ruoyi.fbs.domain.vo.FbsProjectDetailVO;
import com.ruoyi.fbs.domain.vo.FbsProjectListCountVO;
import com.ruoyi.fbs.domain.vo.FbsProjectListVO;
import com.ruoyi.fbs.domain.vo.*;
import com.ruoyi.zbf.service.IZbfProjectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@ -56,26 +55,40 @@ public class AppFbsProjectController extends BaseController {
return AjaxResult.success(zbfProjectService.myListCount());
}
@ApiOperation("分包商查看可报名项目详情")
@GetMapping("/signUp/{id}")
public AjaxResult<FbsProjectDetailVO> signUpDetail(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return AjaxResult.success(zbfProjectService.signUpDetail(id));
}
@ApiOperation("分包商查看已申请项目详情")
@GetMapping("/apply/{id}")
public AjaxResult<FbsProjectDetailVO> applyDetail(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return AjaxResult.success(zbfProjectService.applyDetail(id));
@ApiOperation("分包商查看可报名项目详情")
@GetMapping("/detail/{id}")
public AjaxResult<FbsProjectDetailVO> detail(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id, @Param("type") Integer type) {
//0-可报名项目 //1-已申请项目 //2-已加入或已竣工项目
if(type == 0){
return AjaxResult.success(zbfProjectService.signUpDetail(id));
}else {
return AjaxResult.success(zbfProjectService.applyAllDetail(id));
}
}
@ApiOperation("分包商查看已加入或已竣工项目详情")
@GetMapping("/joinOrComplete/{id}")
public AjaxResult<FbsProjectDetailVO> joinOrCompleteDetail(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return AjaxResult.success(zbfProjectService.joinOrCompleteDetail(id));
}
// @ApiOperation("分包商查看可报名项目详情")
// @GetMapping("/signUp/{id}")
// public AjaxResult<FbsProjectDetailVO> signUpDetail(@NotNull(message = "主键不能为空")
// @PathVariable("id") Long id) {
// return AjaxResult.success(zbfProjectService.signUpDetail(id));
// }
//
// @ApiOperation("分包商查看已申请项目详情")
// @GetMapping("/apply/{id}")
// public AjaxResult<FbsProjectDetailVO> applyDetail(@NotNull(message = "主键不能为空")
// @PathVariable("id") Long id) {
// return AjaxResult.success(zbfProjectService.applyDetail(id));
// }
//
// @ApiOperation("分包商查看已加入或已竣工项目详情")
// @GetMapping("/joinOrComplete/{id}")
// public AjaxResult<FbsProjectDetailVO> joinOrCompleteDetail(@NotNull(message = "主键不能为空")
// @PathVariable("id") Long id) {
// return AjaxResult.success(zbfProjectService.joinOrCompleteDetail(id));
// }
@ApiOperation("分包商查询我的项目列表-项目切换")
@GetMapping("/switchList")
@ -83,6 +96,18 @@ public class AppFbsProjectController extends BaseController {
return zbfProjectService.switchList(dto);
}
@ApiOperation("分包商查询项目详情-用工进度")
@GetMapping("/progress")
public AjaxResult<FbsProjectTaskDetailProgressVO> fbsProgress(Long projectId) {
return AjaxResult.success(zbfProjectService.fbsProgress(projectId));
}
@ApiOperation("分包商查询项目详情-结算情况")
@GetMapping("/wage")
public AjaxResult<FbsProjectTaskDetailWageVO> fbsWage(Long projectId) {
return AjaxResult.success(zbfProjectService.fbsWage(projectId));
}
//
// /**

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectSubcontractingApplyController.java
View File

@ -29,7 +29,7 @@ import javax.validation.constraints.NotNull;
@Api(value = "App分包商项目分包申请控制器", tags = {"App分包商"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/app/fbs/apply")
@RequestMapping("/app/fbs/subApply")
public class AppFbsProjectSubcontractingApplyController extends BaseController {
private final IZbfProjectSubcontractingApplyService iZbfProjectSubcontractingApplyService;

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectTaskApplyController.java
View File

@ -23,7 +23,7 @@ import javax.validation.constraints.NotNull;
@Api(value = "App分包商项目任务申请控制器", tags = {"App分包商"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/app/fbs/apply")
@RequestMapping("/app/fbs/taskApply")
public class AppFbsProjectTaskApplyController extends BaseController {
private final IFbsProjectTaskApplyService iFbsProjectTaskApplyService;

50
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectTaskController.java
View File

@ -1,6 +1,7 @@
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;
@ -10,8 +11,11 @@ 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.domain.entity.FbsUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
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;
@ -21,6 +25,15 @@ 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;
import com.ruoyi.fbs.service.IFbsUserService;
import com.ruoyi.wgz.domain.WgzUser;
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.service.IZbfProjectSectionService;
import com.ruoyi.zbf.service.IZbfProjectService;
import com.ruoyi.zbf.service.IZbfProjectSubcontractingService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@ -46,6 +59,12 @@ public class AppFbsProjectTaskController extends BaseController {
private final IFbsProjectTaskApplyService iFbsProjectTaskApplyService;
private final IBgtUserService iBgtUserService;
private final IBgtProjectRecruitApplyService iBgtProjectRecruitApplyService;
private final IWgzUserService iWgzUserService;
private final IZbfProjectService iZbfProjectService;
private final IZbfProjectSectionService iZbfProjectSectionService;
private final IZbfProjectSubcontractingService iZbfProjectSubcontractingService;
private final IFbsUserService iFbsUserService;
private final ICompanyService iCompanyService;
@ApiOperation("分包商发布任务")
@Log(title = "分包商发布任务", businessType = BusinessType.INSERT)
@ -129,4 +148,35 @@ public class AppFbsProjectTaskController extends BaseController {
return iFbsProjectTaskService.switchList(dto);
}
@ApiOperation("分包商查询包工头信息(点头像)")
@GetMapping("/bgt/{userId}")
public AjaxResult<BgtUser> bgt(@NotNull(message = "主键不能为空")
@PathVariable("userId") Long userId) {
BgtUser bgtUser = iBgtUserService.selectUserByUserId(userId);
bgtUser.setAge(DataUtil.calculateAge(bgtUser.getBirthdate()));
return AjaxResult.success(bgtUser);
}
@ApiOperation("分包商查询务工者信息")
@GetMapping("/wgzInfo")
public AjaxResult<FbsGetWgzUserInfoVO> getWgzUserInfo(Long userId, Long recruitApplyId) {
WgzUser byUserId = iWgzUserService.findByUserId(userId);
FbsGetWgzUserInfoVO vo = BeanUtil.copyProperties(byUserId, FbsGetWgzUserInfoVO.class);
BgtProjectRecruitApply apply = iBgtProjectRecruitApplyService.getById(recruitApplyId);
vo.setWorkStatus(apply.getStatus());
vo.setEntryTime(apply.getEntryTime());
FbsProjectTask task = iFbsProjectTaskService.getById(apply.getTaskId());
ZbfProject project = iZbfProjectService.getById(task.getProjectId());
vo.setProjectName(project.getProjectName());
ZbfProjectSection projectSection = iZbfProjectSectionService.getById(task.getSectionId());
vo.setSectionName(projectSection.getSectionName());
ZbfProjectSubcontracting subcontracting = iZbfProjectSubcontractingService.getById(task.getSubId());
vo.setSubName(subcontracting.getSubName());
FbsUser fbsUser = iFbsUserService.selectUserByUserId(subcontracting.getUserId());
String companyName = iCompanyService.getCompanyNameById(fbsUser.getCompanyId());
vo.setCompanyName(companyName);
vo.setWorkerType("正式员工");
return AjaxResult.success(vo);
}
}