lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设计合同付款、设计合同收款优化

Browse Source
This commit is contained in:
dfdg
2025-11-24 11:37:07 +08:00
parent 9bb41d903e
commit cdf5f8bf5b
2 changed files with 86 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkShejiFkController.java
View File

@ -2,10 +2,18 @@ package org.dromara.xzd.paymentsReceipts.controller;
import java.util.List; import java.util.List;
import cn.dev33.satoken.annotation.SaMode;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*; import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission; 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.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.idempotent.annotation.RepeatSubmit;
@ -35,6 +43,41 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
public class XzdSfkShejiFkController extends BaseController { public class XzdSfkShejiFkController extends BaseController {
private final IXzdSfkShejiFkService xzdSfkShejiFkService; 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<XzdBusinessSealVo> 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<XzdSjContractInfoVo> 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<XzdSjContractInfoVo> list(XzdSjContractInfoBo bo, PageQuery pageQuery) {
return xzdSjContractInfoService.queryPageList(bo, pageQuery);
}
/** /**
* 查询设计合同付款列表 * 查询设计合同付款列表

43
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkShejiSkController.java
View File

@ -2,10 +2,18 @@ package org.dromara.xzd.paymentsReceipts.controller;
import java.util.List; import java.util.List;
import cn.dev33.satoken.annotation.SaMode;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*; import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission; 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.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.idempotent.annotation.RepeatSubmit;
@ -36,6 +44,41 @@ public class XzdSfkShejiSkController extends BaseController {
private final IXzdSfkShejiSkService xzdSfkShejiSkService; 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<XzdBusinessSealVo> 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<XzdSjContractInfoVo> 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<XzdSjContractInfoVo> list(XzdSjContractInfoBo bo, PageQuery pageQuery) {
return xzdSjContractInfoService.queryPageList(bo, pageQuery);
}
/** /**
* 查询设计合同收款列表 * 查询设计合同收款列表
*/ */