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

优化

Browse Source
This commit is contained in:
zt
2025-08-20 19:23:00 +08:00
parent 382d4b034b
commit 162120ec31
8 changed files with 161 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusPurchaseDocServiceImpl.java
View File

@ -213,7 +213,14 @@ public class BusPurchaseDocServiceImpl extends ServiceImpl<BusPurchaseDocMapper,
* 保存前的数据校验
*/
private void validEntityBeforeSave(BusPurchaseDoc entity) {
//TODO 做一些数据校验,如唯一约束
List<BusPurchaseDoc> 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("该项目已存在此采购单编号");
}
}
/**

24
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrExpensesContract.java
View File

@ -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;
}

24
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/CtrIncomeContract.java
View File

@ -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;
}

23
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrExpensesContractBo.java
View File

@ -74,5 +74,28 @@ public class CtrExpensesContractBo extends BaseEntity {
*/
private List<CtrFileBo> fileList;
/**
* 预付款比例
*/
private BigDecimal advancePayRatio;
/**
* 尾款比例
*/
private BigDecimal balancePayRatio;
/**
* 质保金比例
*/
private BigDecimal assuranceDepositRatio;
/**
* 付款类型 1-月结算 2-形象节点
*/
private String payType;
/**
* 付款比例
*/
private BigDecimal payRatio;
}

25
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/bo/CtrIncomeContractBo.java
View File

@ -68,4 +68,29 @@ public class CtrIncomeContractBo extends BaseEntity {
* 附件
*/
private List<CtrFileBo> fileList;
/**
* 预付款比例
*/
private BigDecimal advancePayRatio;
/**
* 尾款比例
*/
private BigDecimal balancePayRatio;
/**
* 质保金比例
*/
private BigDecimal assuranceDepositRatio;
/**
* 付款类型 1-月结算 2-形象节点
*/
private String payType;
/**
* 付款比例
*/
private BigDecimal payRatio;
}

24
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrExpensesContractVo.java
View File

@ -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;
}

23
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/domain/vo/CtrIncomeContractVo.java
View File

@ -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;
}

10
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesDesignChangeServiceImpl.java
View File

@ -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<DesDesignChangeMappe
if (projectId != null && projectService.getById(projectId) == null) {
throw new ServiceException("对应项目不存在", HttpStatus.NOT_FOUND);
}
//编号不能重复
List<DesDesignChange> 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("编号已存在");
}
}
/**