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-22 16:30:37 +08:00
parent d99eaafd4c
commit a2e8712808
8 changed files with 108 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,10 @@
package com.ruoyi.web.controller.fbs;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.enums.BusinessType;
import com.ruoyi.common.enums.SubcontractingApplyStatus;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.zbf.domain.ZbfProjectSubcontractingApply;
import com.ruoyi.zbf.service.IZbfProjectSubcontractingApplyService;
import io.swagger.annotations.Api;
@ -34,7 +30,6 @@ public class AppFbsProjectSubcontractingApplyController extends BaseController {
private final IZbfProjectSubcontractingApplyService iZbfProjectSubcontractingApplyService;
/**
* 新增总包方项目分包申请
*/
@ -55,10 +50,6 @@ public class AppFbsProjectSubcontractingApplyController extends BaseController {
@PutMapping("/{subId}")
public AjaxResult<Boolean> cancel(@NotNull(message = "主键不能为空")
@PathVariable("subId") Long subId) {
LambdaUpdateWrapper<ZbfProjectSubcontractingApply> wrapper = Wrappers.<ZbfProjectSubcontractingApply>lambdaUpdate()
.eq(ZbfProjectSubcontractingApply::getSubId, subId)
.eq(ZbfProjectSubcontractingApply::getFbsUserId, SecurityUtils.getAppUserId())
.set(ZbfProjectSubcontractingApply::getApplyStatus, SubcontractingApplyStatus.CANCEL.getCode());
return AjaxResult.success(iZbfProjectSubcontractingApplyService.update(wrapper));
return AjaxResult.success(iZbfProjectSubcontractingApplyService.cancel(subId));
}
}

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

@ -54,4 +54,17 @@ public class AppFbsProjectSubcontractingController extends BaseController {
return AjaxResult.success(vo);
}
@ApiOperation("分包商消息-查询项目分包详细信息")
@GetMapping("/message/{applyId}")
public AjaxResult<FbsProjectSubcontractingDetailVO> getInfoByApplyId(@NotNull(message = "主键不能为空")
@PathVariable("applyId") Long applyId) {
ZbfProjectSubcontractingApply apply = iZbfProjectSubcontractingApplyService.getById(applyId);
ZbfProjectSubcontracting zbfProjectSubcontracting = iZbfProjectSubcontractingService.queryById(apply.getSubId());
FbsProjectSubcontractingDetailVO vo = BeanUtil.copyProperties(zbfProjectSubcontracting, FbsProjectSubcontractingDetailVO.class);
vo.setSectionName(zbfProjectSectionService.getById(vo.getSectionId()).getSectionName());
vo.setProjectImg(zbfProjectService.getById(vo.getProjectId()).getProjectImg());
vo.setApplyStatus(apply.getApplyStatus());
return AjaxResult.success(vo);
}
}