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-14 16:06:50 +08:00
parent b52be6eeab
commit f80a9b6e39
16 changed files with 184 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtMessageController.java
View File

@ -104,7 +104,7 @@ public class AppBgtMessageController extends BaseController {
BigDecimal allPay = iWgzAttendanceService.getAllPay(userId, recruitApplyId, recruit.getRecruitAmount());
//获取个人已结算工资
BigDecimal alreadyPay = iWgzPayCalculationService.getAlreadyPay(userId, recruitApplyId);
res.setIsPay(allPay.equals(alreadyPay));
res.setIsPay(allPay.compareTo(alreadyPay)==0);
}
return AjaxResult.success(res);
}
@ -115,5 +115,9 @@ public class AppBgtMessageController extends BaseController {
return iBgtMessageService.unAuditList(dto);
}
@ApiOperation("消息详情")
@GetMapping("/detail/{id}")
public AjaxResult<BgtMessage> detail(@PathVariable(value = "id") Long id) {
return AjaxResult.success(iBgtMessageService.getById(id));
}
}

8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectSubcontractingController.java
View File

@ -3,10 +3,13 @@ package com.ruoyi.web.controller.fbs;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.fbs.domain.vo.FbsProjectSubcontractingDetailVO;
import com.ruoyi.zbf.domain.ZbfProjectSubcontracting;
import com.ruoyi.zbf.domain.ZbfProjectSubcontractingApply;
import com.ruoyi.zbf.service.IZbfProjectSectionService;
import com.ruoyi.zbf.service.IZbfProjectService;
import com.ruoyi.zbf.service.IZbfProjectSubcontractingApplyService;
import com.ruoyi.zbf.service.IZbfProjectSubcontractingService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -34,6 +37,7 @@ public class AppFbsProjectSubcontractingController extends BaseController {
private final IZbfProjectSubcontractingService iZbfProjectSubcontractingService;
private final IZbfProjectSectionService zbfProjectSectionService;
private final IZbfProjectService zbfProjectService;
private final IZbfProjectSubcontractingApplyService iZbfProjectSubcontractingApplyService;
@ApiOperation("分包商查询项目分包详细信息")
@GetMapping("/{id}")
@ -43,6 +47,10 @@ public class AppFbsProjectSubcontractingController extends BaseController {
FbsProjectSubcontractingDetailVO vo = BeanUtil.copyProperties(zbfProjectSubcontracting, FbsProjectSubcontractingDetailVO.class);
vo.setSectionName(zbfProjectSectionService.getById(vo.getSectionId()).getSectionName());
vo.setProjectImg(zbfProjectService.getById(vo.getProjectId()).getProjectImg());
ZbfProjectSubcontractingApply subcontractingApply = iZbfProjectSubcontractingApplyService.queryBySubIdAndFbsUserId(id, SecurityUtils.getAppUserId());
if (subcontractingApply != null) {
vo.setApplyStatus(subcontractingApply.getApplyStatus());
}
return AjaxResult.success(vo);
}

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

@ -175,4 +175,27 @@ public class AppFbsProjectTaskController extends BaseController {
return AjaxResult.success(vo);
}
@ApiOperation("分包商完成任务")
@Log(title = "分包商完成任务", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping("/complete/{taskId}")
public AjaxResult<Boolean> complete(@NotNull(message = "主键不能为空")
@PathVariable("taskId") Long taskId) {
return AjaxResult.success(iFbsProjectTaskService.complete(taskId));
}
@ApiOperation("分包商完成任务前检查")
@GetMapping("/checkBeforeComplete/{taskId}")
public AjaxResult<Boolean> checkBeforeComplete(@NotNull(message = "主键不能为空")
@PathVariable("taskId") Long taskId) {
return AjaxResult.success(iFbsProjectTaskService.checkBeforeComplete(taskId));
}
@ApiOperation("分包商完成任务提醒消息")
@PostMapping("/sendRemindMessage/{taskId}")
public AjaxResult<Boolean> sendRemindMessage(@NotNull(message = "主键不能为空")
@PathVariable("taskId") Long taskId) {
return AjaxResult.success(iFbsProjectTaskService.sendRemindMessage(taskId));
}
}