diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractChangeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractChangeController.java index fac94736..0069dc30 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractChangeController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractChangeController.java @@ -134,4 +134,17 @@ public class XzdCsContractChangeController extends BaseController { return xzdBusinessSealService.queryPageList(bo, pageQuery); } + + /** + * 获取综合服务合同信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"comprehensive:csContractChange:add","comprehensive:csContractChange:edit"},mode = SaMode.OR) + @GetMapping("/get/{id}") + public R getCsContractInformationInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdCsContractInformationService.queryById(id)); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractInformationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractInformationController.java index 46e3243f..32fb51b2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractInformationController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractInformationController.java @@ -2,10 +2,21 @@ package org.dromara.xzd.comprehensive.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaMode; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.xzd.comprehensive.domain.bo.XzdCsContractChangeBo; +import org.dromara.xzd.comprehensive.domain.bo.XzdCsContractSuspendBo; +import org.dromara.xzd.comprehensive.domain.vo.XzdCsContractChangeVo; +import org.dromara.xzd.comprehensive.domain.vo.XzdCsContractSuspendVo; +import org.dromara.xzd.comprehensive.service.IXzdCsContractChangeService; +import org.dromara.xzd.comprehensive.service.IXzdCsContractSuspendService; +import org.dromara.xzd.domain.bo.XzdBusinessSealBo; +import org.dromara.xzd.domain.vo.XzdBusinessSealVo; +import org.dromara.xzd.service.IXzdBusinessSealService; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,6 +47,66 @@ public class XzdCsContractInformationController extends BaseController { private final IXzdCsContractInformationService xzdCsContractInformationService; + private final IXzdBusinessSealService xzdBusinessSealService; + + @Lazy + private final IXzdCsContractSuspendService xzdCsContractSuspendService; + + @Lazy + private final IXzdCsContractChangeService xzdCsContractChangeService; + + + /** + * 查询综合服务合同变更列表 + */ + @SaCheckPermission(value = {"comprehensive:csContractInformation:add","comprehensive:csContractInformation:edit","comprehensive:csContractInformation:list"},mode = SaMode.OR) + @GetMapping("/getChangList") + public TableDataInfo getChangList(XzdCsContractChangeBo bo, PageQuery pageQuery) { + return xzdCsContractChangeService.queryPageList(bo, pageQuery); + } + + /** + * 获取综合服务合同变更详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"comprehensive:csContractInformation:add","comprehensive:csContractInformation:edit","comprehensive:csContractInformation:list"},mode = SaMode.OR) + @GetMapping("/getChang/{id}") + public R getChangInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdCsContractChangeService.queryById(id)); + } + + /** + * 查询综合服务合同终止列表 + */ + @SaCheckPermission(value = {"comprehensive:csContractInformation:add","comprehensive:csContractInformation:edit","comprehensive:csContractInformation:list"},mode = SaMode.OR) + @GetMapping("/getSuspendList") + public TableDataInfo getSuspendList(XzdCsContractSuspendBo bo, PageQuery pageQuery) { + return xzdCsContractSuspendService.queryPageList(bo, pageQuery); + } + + /** + * 获取综合服务合同终止详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"comprehensive:csContractInformation:add","comprehensive:csContractInformation:edit","comprehensive:csContractInformation:list"},mode = SaMode.OR) + @GetMapping("/getSuspend/{id}") + public R getSuspendInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdCsContractSuspendService.queryById(id)); + } + + /** + * 查询印章帮助列表 + */ + @SaCheckPermission(value = {"comprehensive:csContractInformation:add","comprehensive:csContractInformation:edit","comprehensive:csContractInformation:list"},mode = SaMode.OR) + @GetMapping("/businessSealList") + public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { + return xzdBusinessSealService.queryPageList(bo, pageQuery); + } + /** * 查询综合服务合同信息列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractSuspendController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractSuspendController.java index 6d4afb53..5f5a772c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractSuspendController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/controller/XzdCsContractSuspendController.java @@ -135,4 +135,18 @@ public class XzdCsContractSuspendController extends BaseController { return xzdBusinessSealService.queryPageList(bo, pageQuery); } + + + /** + * 获取综合服务合同信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"comprehensive:csContractChange:add","comprehensive:csContractChange:edit"},mode = SaMode.OR) + @GetMapping("/get/{id}") + public R getCsContractInformationInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdCsContractInformationService.queryById(id)); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java index cf9c1af0..46c2a7ea 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java @@ -174,6 +174,7 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl lqw = Wrappers.lambdaQuery(); lqw.orderByDesc(XzdPurchaseContractInformation::getId); lqw.eq(StringUtils.isNotBlank(bo.getContractCode()), XzdPurchaseContractInformation::getContractCode, bo.getContractCode()); + lqw.eq(StringUtils.isNotBlank(bo.getAuditStatus()), XzdPurchaseContractInformation::getAuditStatus, bo.getAuditStatus()); lqw.eq(StringUtils.isNotBlank(bo.getSfzz()), XzdPurchaseContractInformation::getSfzz, bo.getSfzz()); lqw.eq(StringUtils.isNotBlank(bo.getAuditStatus()), XzdPurchaseContractInformation::getAuditStatus, bo.getAuditStatus()); lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdPurchaseContractInformation::getContractName, bo.getContractName()); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java index 60547fb0..4991205d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysJdcbfjController.java @@ -58,6 +58,19 @@ public class XzdCbysJdcbfjController extends BaseController { return xzdCbysZjhcbService.queryPageList(bo, pageQuery); } + + /** + * 获取立项及成本-成本预算-总体计划成本详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"costBudget:cbysJdcbfj:add","costBudget:cbysJdcbfj:edit","costBudget:cbysJdcbfj:list"},mode = SaMode.OR) + @GetMapping("/get/{id}") + public R getCbysZjhcbInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdCbysZjhcbService.queryById(id)); + } + /** * 查询立项及成本-成本预算-阶段成本分解列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java index 9b0a3c43..debafa92 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/costProjectApproval/costBudget/controller/XzdCbysZjhcbAlterationController.java @@ -59,6 +59,18 @@ public class XzdCbysZjhcbAlterationController extends BaseController { return xzdCbysZjhcbService.queryPageList(bo, pageQuery); } + /** + * 获取立项及成本-成本预算-总体计划成本详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"costBudget:cbysZjhcbAlteration:add","costBudget:cbysZjhcbAlteration:edit","costBudget:cbysZjhcbAlteration:list"},mode = SaMode.OR) + @GetMapping("/get/{id}") + public R getCbysZjhcbInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdCbysZjhcbService.queryById(id)); + } + /** * 查询立项及成本-成本预算-总体计划成本变更列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkCaigouFkController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkCaigouFkController.java index 38afe104..da639b65 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkCaigouFkController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkCaigouFkController.java @@ -99,6 +99,18 @@ public class XzdSfkCaigouFkController extends BaseController { return R.ok(xzdSfkCaigouFkService.queryById(id)); } + /** + * 获取采购合同信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"paymentsReceipts:sfkCaigouFk:add","paymentsReceipts:sfkCaigouFk:edit"},mode = SaMode.OR) + @GetMapping("/get/{id}") + public R getPurchaseContractInformationInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdPurchaseContractInformationService.queryById(id)); + } + /** * 新增采购合同付款 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkZonhefuwuFkController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkZonhefuwuFkController.java index d403a779..1f6d7e1b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkZonhefuwuFkController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkZonhefuwuFkController.java @@ -67,6 +67,18 @@ public class XzdSfkZonhefuwuFkController extends BaseController { return xzdCsContractInformationService.queryPageList(bo, pageQuery); } + /** + * 获取综合服务合同信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"settlement:jsZhfwJindu:add","settlement:jsZhfwJindu:edit"},mode = SaMode.OR) + @GetMapping("/get/{id}") + public R getCsContractInformationInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdCsContractInformationService.queryById(id)); + } + /** * 查询综合服务合同付款列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdBusinessSealServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdBusinessSealServiceImpl.java index a48a5cb0..793e4296 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdBusinessSealServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdBusinessSealServiceImpl.java @@ -81,6 +81,7 @@ public class XzdBusinessSealServiceImpl extends ServiceImpl lqw = Wrappers.lambdaQuery(); lqw.orderByDesc(XzdBusinessSeal::getId); lqw.eq(StringUtils.isNotBlank(bo.getYzNum()), XzdBusinessSeal::getYzNum, bo.getYzNum()); + lqw.eq(StringUtils.isNotBlank(bo.getShzt()), XzdBusinessSeal::getShzt, bo.getShzt()); lqw.like(StringUtils.isNotBlank(bo.getYzName()), XzdBusinessSeal::getYzName, bo.getYzName()); return lqw; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java index 76bf39f8..384081d0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJinduController.java @@ -68,6 +68,19 @@ public class XzdJsCgJinduController extends BaseController { return xzdPurchaseContractInformationService.queryPageList(bo, pageQuery); } + + /** + * 获取采购合同信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"settlement:jsCgJindu:add","settlement:jsCgJindu:edit"},mode = SaMode.OR) + @GetMapping("/get/{id}") + public R getPurchaseContractInformationInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdPurchaseContractInformationService.queryById(id)); + } + /** * 查询采购合同进度结算列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java index 5a0e4aa3..b0432ffc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonController.java @@ -70,6 +70,19 @@ public class XzdJsCgJungonController extends BaseController { return xzdPurchaseContractInformationService.queryPageList(bo, pageQuery); } + + /** + * 获取采购合同信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"settlement:jsCgJungon:add","settlement:jsCgJungon:edit"},mode = SaMode.OR) + @GetMapping("/get/{id}") + public R getPurchaseContractInformationInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdPurchaseContractInformationService.queryById(id)); + } + /** * 查询采购合同竣工结算列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java index 09e08b31..acc6ad76 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsCgJungonEditController.java @@ -63,7 +63,7 @@ public class XzdJsCgJungonEditController extends BaseController { * 查询采购合同竣工结算列表 */ @SaCheckPermission(value = {"settlement:jsCgJungonEdit:list","settlement:jsCgJungonEdit:add","settlement:jsCgJungonEdit:edit"},mode = SaMode.OR) - @GetMapping("/list") + @GetMapping("/getList") public TableDataInfo list(XzdJsCgJungonBo bo, PageQuery pageQuery) { return xzdJsCgJungonService.queryPageList(bo, pageQuery); } @@ -72,7 +72,7 @@ public class XzdJsCgJungonEditController extends BaseController { * 查询采购合同竣工结算调整列表 */ @SaCheckPermission("settlement:jsCgJungonEdit:list") - @GetMapping("/jsCgJungonEditList") + @GetMapping("/list") public TableDataInfo list(XzdJsCgJungonEditBo bo, PageQuery pageQuery) { return xzdJsCgJungonEditService.queryPageList(bo, pageQuery); } @@ -100,6 +100,18 @@ public class XzdJsCgJungonEditController extends BaseController { return R.ok(xzdJsCgJungonEditService.queryById(id)); } + /** + * 获取采购合同竣工结算详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"settlement:jsCgJungonEdit:add","settlement:jsCgJungonEdit:edit"},mode = SaMode.OR) + @GetMapping("/get/{id}") + public R getJsCgJungonInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdJsCgJungonService.queryById(id)); + } + /** * 新增采购合同竣工结算调整 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java index b87656d4..efa180bc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/controller/XzdJsZhfwJinduController.java @@ -60,6 +60,19 @@ public class XzdJsZhfwJinduController extends BaseController { return xzdBusinessSealService.queryPageList(bo, pageQuery); } + + /** + * 获取综合服务合同信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"settlement:jsZhfwJindu:add","settlement:jsZhfwJindu:edit" },mode = SaMode.OR) + @GetMapping("/get/{id}") + public R getCsContractInformationInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdCsContractInformationService.queryById(id)); + } + /** * 查询综合服务合同进度结算列表 */