zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into test

Browse Source
This commit is contained in:
qianshijiang
2026-01-22 17:44:03 +08:00
parent 6ba4bdec2c 707e7d779a
commit 8216466ee7
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/AmountSplitRespDTO.java
View File

@@ -27,7 +27,7 @@ public class AmountSplitRespDTO {
private String elementCode; private String elementCode;
@Schema(description = "占比") @Schema(description = "占比")
private BigDecimal ratio; private BigDecimal proportion;
@Schema(description = "合同id", example = "3781") @Schema(description = "合同id", example = "3781")
private Long contractId; private Long contractId;

2
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/AmountDismantlePageReqVO.java
View File

@@ -29,7 +29,7 @@ public class AmountDismantlePageReqVO extends PageParam {
private String elementCode; private String elementCode;
@Schema(description = "占比") @Schema(description = "占比")
private BigDecimal ratio; private BigDecimal proportion;
@Schema(description = "合同id", example = "3781") @Schema(description = "合同id", example = "3781")
private Long contractId; private Long contractId;

2
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/AmountDismantleRespVO.java
View File

@@ -38,7 +38,7 @@ public class AmountDismantleRespVO {
@Schema(description = "占比") @Schema(description = "占比")
@ExcelProperty("占比") @ExcelProperty("占比")
private BigDecimal ratio; private BigDecimal proportion;
@Schema(description = "合同id", example = "3781") @Schema(description = "合同id", example = "3781")
@ExcelProperty("合同id") @ExcelProperty("合同id")

2
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/AmountDismantleSaveReqVO.java
View File

@@ -28,7 +28,7 @@ public class AmountDismantleSaveReqVO {
private String elementCode; private String elementCode;
@Schema(description = "占比") @Schema(description = "占比")
private BigDecimal ratio; private BigDecimal proportion;
@Schema(description = "合同id", example = "3781") @Schema(description = "合同id", example = "3781")
private Long contractId; private Long contractId;

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/amountdismantle/AmountDismantleDO.java
View File

@@ -61,7 +61,7 @@ public class AmountDismantleDO extends BusinessBaseDO {
* 占比 * 占比
*/ */
@TableField("RTIO") @TableField("RTIO")
private BigDecimal ratio; private BigDecimal proportion;
/** /**
* 合同id * 合同id
*/ */

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/amountdismantle/AmountDismantleMapper.java
View File

@@ -24,7 +24,7 @@ public interface AmountDismantleMapper extends BaseMapperX<AmountDismantleDO> {
.eqIfPresent(AmountDismantleDO::getElementAbbreviation, reqVO.getElementAbbreviation()) .eqIfPresent(AmountDismantleDO::getElementAbbreviation, reqVO.getElementAbbreviation())
.likeIfPresent(AmountDismantleDO::getElementName, reqVO.getElementName()) .likeIfPresent(AmountDismantleDO::getElementName, reqVO.getElementName())
.eqIfPresent(AmountDismantleDO::getElementCode, reqVO.getElementCode()) .eqIfPresent(AmountDismantleDO::getElementCode, reqVO.getElementCode())
.eqIfPresent(AmountDismantleDO::getRatio, reqVO.getRatio()) .eqIfPresent(AmountDismantleDO::getProportion, reqVO.getProportion())
.eqIfPresent(AmountDismantleDO::getContractId, reqVO.getContractId()) .eqIfPresent(AmountDismantleDO::getContractId, reqVO.getContractId())
.betweenIfPresent(AmountDismantleDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(AmountDismantleDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(AmountDismantleDO::getId)); .orderByDesc(AmountDismantleDO::getId));