diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkShejiFkController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkShejiFkController.java index 39aab4c9..0a809332 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkShejiFkController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkShejiFkController.java @@ -2,10 +2,18 @@ package org.dromara.xzd.paymentsReceipts.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.XzdSjContractInfoBo; +import org.dromara.xzd.comprehensive.domain.vo.XzdSjContractInfoVo; +import org.dromara.xzd.comprehensive.service.IXzdSjContractInfoService; +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; @@ -35,6 +43,41 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; public class XzdSfkShejiFkController extends BaseController { private final IXzdSfkShejiFkService xzdSfkShejiFkService; + @Lazy + private final IXzdSjContractInfoService xzdSjContractInfoService; + + +// private final IXzdBusinessSealService xzdBusinessSealService; +// +// /** +// * 查询印章帮助列表 +// */ +// @SaCheckPermission(value = {"settlement:jsSjJindu:add","settlement:jsSjJindu:edit","settlement:jsSjJindu:list"},mode = SaMode.OR) +// @GetMapping("/businessSealList") +// public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { +// return xzdBusinessSealService.queryPageList(bo, pageQuery); +// } + + /** + * 获取设计合同信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"settlement:jsSjJindu:add","settlement:jsSjJindu:edit"},mode = SaMode.OR) + @GetMapping("/get/{id}") + public R getCsContractInformationInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdSjContractInfoService.queryById(id)); + } + + /** + * 查询采购合同信息列表 + */ + @SaCheckPermission(value = {"settlement:jsSjJindu:list","settlement:jsSjJindu:add","settlement:jsSjJindu:edit"}, mode = SaMode.OR) + @GetMapping("/getList") + public TableDataInfo list(XzdSjContractInfoBo bo, PageQuery pageQuery) { + return xzdSjContractInfoService.queryPageList(bo, pageQuery); + } /** * 查询设计合同付款列表 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkShejiSkController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkShejiSkController.java index 3ec73570..903743aa 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkShejiSkController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkShejiSkController.java @@ -2,10 +2,18 @@ package org.dromara.xzd.paymentsReceipts.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.XzdSjContractInfoBo; +import org.dromara.xzd.comprehensive.domain.vo.XzdSjContractInfoVo; +import org.dromara.xzd.comprehensive.service.IXzdSjContractInfoService; +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 +44,41 @@ public class XzdSfkShejiSkController extends BaseController { private final IXzdSfkShejiSkService xzdSfkShejiSkService; + @Lazy + private final IXzdSjContractInfoService xzdSjContractInfoService; + + +// private final IXzdBusinessSealService xzdBusinessSealService; +// +// /** +// * 查询印章帮助列表 +// */ +// @SaCheckPermission(value = {"settlement:jsSjJindu:add","settlement:jsSjJindu:edit","settlement:jsSjJindu:list"},mode = SaMode.OR) +// @GetMapping("/businessSealList") +// public TableDataInfo list(XzdBusinessSealBo bo, PageQuery pageQuery) { +// return xzdBusinessSealService.queryPageList(bo, pageQuery); +// } + /** + * 获取设计合同信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission(value = {"settlement:jsSjJindu:add","settlement:jsSjJindu:edit"},mode = SaMode.OR) + @GetMapping("/get/{id}") + public R getCsContractInformationInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(xzdSjContractInfoService.queryById(id)); + } + + /** + * 查询采购合同信息列表 + */ + @SaCheckPermission(value = {"settlement:jsSjJindu:list","settlement:jsSjJindu:add","settlement:jsSjJindu:edit"}, mode = SaMode.OR) + @GetMapping("/getList") + public TableDataInfo list(XzdSjContractInfoBo bo, PageQuery pageQuery) { + return xzdSjContractInfoService.queryPageList(bo, pageQuery); + } + /** * 查询设计合同收款列表 */