From 162120ec319ad5b91ca597dea504bd792cebfde4 Mon Sep 17 00:00:00 2001 From: zt Date: Wed, 20 Aug 2025 19:23:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BusPurchaseDocServiceImpl.java | 9 ++++++- .../ctr/domain/CtrExpensesContract.java | 24 ++++++++++++++++++ .../dromara/ctr/domain/CtrIncomeContract.java | 24 ++++++++++++++++++ .../ctr/domain/bo/CtrExpensesContractBo.java | 23 +++++++++++++++++ .../ctr/domain/bo/CtrIncomeContractBo.java | 25 +++++++++++++++++++ .../ctr/domain/vo/CtrExpensesContractVo.java | 24 ++++++++++++++++++ .../ctr/domain/vo/CtrIncomeContractVo.java | 23 +++++++++++++++++ .../impl/DesDesignChangeServiceImpl.java | 10 ++++++++ 8 files changed, 161 insertions(+), 1 deletion(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusPurchaseDocServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusPurchaseDocServiceImpl.java index f5cc1834..10007ad9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusPurchaseDocServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusPurchaseDocServiceImpl.java @@ -213,7 +213,14 @@ public class BusPurchaseDocServiceImpl extends ServiceImpl list = list(Wrappers.lambdaQuery(BusPurchaseDoc.class) + .eq(BusPurchaseDoc::getProjectId, entity.getProjectId()) + .eq(BusPurchaseDoc::getDocCode, entity.getDocCode()) + .ne(entity.getId() != null, BusPurchaseDoc::getId, entity.getId()) + ); + if (!list.isEmpty()) { + throw new ServiceException("该项目已存在此采购单编号"); + } } /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrExpensesContract.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrExpensesContract.java index ef69e433..7814aa10 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrExpensesContract.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrExpensesContract.java @@ -68,5 +68,29 @@ public class CtrExpensesContract extends BaseEntity { */ private String remark; + /** + * 预付款比例 + */ + private BigDecimal advancePayRatio; + + /** + * 尾款比例 + */ + private BigDecimal balancePayRatio; + + /** + * 质保金比例 + */ + private BigDecimal assuranceDepositRatio; + + /** + * 付款类型 1-月结算 2-形象节点 + */ + private String payType; + + /** + * 付款比例 + */ + private BigDecimal payRatio; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrIncomeContract.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrIncomeContract.java index fed7b2bc..a3e8e5e7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrIncomeContract.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrIncomeContract.java @@ -63,5 +63,29 @@ public class CtrIncomeContract extends BaseEntity { */ private String remark; + /** + * 预付款比例 + */ + private BigDecimal advancePayRatio; + + /** + * 尾款比例 + */ + private BigDecimal balancePayRatio; + + /** + * 质保金比例 + */ + private BigDecimal assuranceDepositRatio; + + /** + * 付款类型 1-月结算 2-形象节点 + */ + private String payType; + + /** + * 付款比例 + */ + private BigDecimal payRatio; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrExpensesContractBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrExpensesContractBo.java index de4146c3..4a7386b7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrExpensesContractBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrExpensesContractBo.java @@ -74,5 +74,28 @@ public class CtrExpensesContractBo extends BaseEntity { */ private List fileList; + /** + * 预付款比例 + */ + private BigDecimal advancePayRatio; + /** + * 尾款比例 + */ + private BigDecimal balancePayRatio; + + /** + * 质保金比例 + */ + private BigDecimal assuranceDepositRatio; + + /** + * 付款类型 1-月结算 2-形象节点 + */ + private String payType; + + /** + * 付款比例 + */ + private BigDecimal payRatio; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrIncomeContractBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrIncomeContractBo.java index 8e18b390..a6d96e15 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrIncomeContractBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrIncomeContractBo.java @@ -68,4 +68,29 @@ public class CtrIncomeContractBo extends BaseEntity { * 附件 */ private List fileList; + + /** + * 预付款比例 + */ + private BigDecimal advancePayRatio; + + /** + * 尾款比例 + */ + private BigDecimal balancePayRatio; + + /** + * 质保金比例 + */ + private BigDecimal assuranceDepositRatio; + + /** + * 付款类型 1-月结算 2-形象节点 + */ + private String payType; + + /** + * 付款比例 + */ + private BigDecimal payRatio; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrExpensesContractVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrExpensesContractVo.java index 1cf04cae..c423c129 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrExpensesContractVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrExpensesContractVo.java @@ -93,4 +93,28 @@ public class CtrExpensesContractVo implements Serializable { private String remark; + /** + * 预付款比例 + */ + private BigDecimal advancePayRatio; + + /** + * 尾款比例 + */ + private BigDecimal balancePayRatio; + + /** + * 质保金比例 + */ + private BigDecimal assuranceDepositRatio; + + /** + * 付款类型 1-月结算 2-形象节点 + */ + private String payType; + + /** + * 付款比例 + */ + private BigDecimal payRatio; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrIncomeContractVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrIncomeContractVo.java index 32e66721..2d12ec90 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrIncomeContractVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrIncomeContractVo.java @@ -87,5 +87,28 @@ public class CtrIncomeContractVo implements Serializable { @ExcelProperty(value = "备注") private String remark; + /** + * 预付款比例 + */ + private BigDecimal advancePayRatio; + /** + * 尾款比例 + */ + private BigDecimal balancePayRatio; + + /** + * 质保金比例 + */ + private BigDecimal assuranceDepositRatio; + + /** + * 付款类型 1-月结算 2-形象节点 + */ + private String payType; + + /** + * 付款比例 + */ + private BigDecimal payRatio; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesDesignChangeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesDesignChangeServiceImpl.java index d9c4fbbf..8b33e098 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesDesignChangeServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesDesignChangeServiceImpl.java @@ -47,6 +47,7 @@ import org.dromara.design.service.IDesDesignChangeService; import org.dromara.design.service.IDesDrawingService; import org.dromara.design.service.IDesVolumeCatalogService; import org.dromara.design.service.IDesVolumeFileService; +import org.dromara.facility.domain.FacMatrix; import org.dromara.project.service.IBusProjectService; import org.dromara.system.domain.vo.SysOssVo; import org.dromara.system.service.ISysOssService; @@ -277,6 +278,15 @@ public class DesDesignChangeServiceImpl extends ServiceImpl list = list(Wrappers.lambdaQuery(DesDesignChange.class) + .eq(DesDesignChange::getFormNo, entity.getFormNo()) + .eq(DesDesignChange::getProjectId, projectId) + .ne(!create, DesDesignChange::getId, entity.getId()) + ); + if (!list.isEmpty()) { + throw new ServiceException("编号已存在"); + } } /**