From bd7b76767f9382971750f9af030f730b4cadd5c4 Mon Sep 17 00:00:00 2001 From: yinq Date: Mon, 9 Mar 2026 16:56:52 +0800 Subject: [PATCH] =?UTF-8?q?1.0.79=20=E5=90=88=E5=90=8C=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E7=B1=BB=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/erp/domain/ErpContractChange.java | 5 +- .../oa/erp/domain/ErpContractChangeInfo.java | 5 +- .../erp/domain/ErpContractChangeMaterial.java | 11 ++-- .../ErpContractChangePaymentMethod.java | 9 ++-- .../oa/erp/domain/bo/ErpContractChangeBo.java | 5 +- .../domain/bo/ErpContractChangeInfoBo.java | 5 +- .../bo/ErpContractChangeMaterialBo.java | 11 ++-- .../bo/ErpContractChangePaymentMethodBo.java | 9 ++-- .../domain/bo/ErpContractChangeSaveBo.java | 9 ++-- .../domain/vo/ErpContractChangeInfoVo.java | 5 +- .../vo/ErpContractChangeMaterialVo.java | 11 ++-- .../vo/ErpContractChangePaymentMethodVo.java | 9 ++-- .../oa/erp/domain/vo/ErpContractChangeVo.java | 5 +- .../impl/ErpContractChangeServiceImpl.java | 50 ++++++++++--------- 14 files changed, 83 insertions(+), 66 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChange.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChange.java index 276771dd..737d7141 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChange.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChange.java @@ -4,6 +4,7 @@ import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -62,7 +63,7 @@ public class ErpContractChange extends TenantEntity { /** * 合同金额 */ - private Long changeContractAmount; + private BigDecimal changeContractAmount; /** * 原合同编号 @@ -82,7 +83,7 @@ public class ErpContractChange extends TenantEntity { /** * 原合同金额 */ - private Long originalContractAmount; + private BigDecimal originalContractAmount; /** * 变更原因 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChangeInfo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChangeInfo.java index c9b77f85..8d8b1e74 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChangeInfo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChangeInfo.java @@ -4,6 +4,7 @@ import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -82,7 +83,7 @@ public class ErpContractChangeInfo extends TenantEntity { /** * 合同总价 */ - private Long totalPrice; + private BigDecimal totalPrice; /** * 甲方公司 @@ -192,7 +193,7 @@ public class ErpContractChangeInfo extends TenantEntity { /** * 合同税率 */ - private Long taxRate; + private BigDecimal taxRate; /** * 签订地点 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChangeMaterial.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChangeMaterial.java index b5d39d0b..e4556f48 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChangeMaterial.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChangeMaterial.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serial; +import java.math.BigDecimal; /** * 合同变更物料对象 erp_contract_change_material @@ -60,7 +61,7 @@ public class ErpContractChangeMaterial extends TenantEntity { /** * 数量 */ - private Long amount; + private BigDecimal amount; /** * 单位ID @@ -70,22 +71,22 @@ public class ErpContractChangeMaterial extends TenantEntity { /** * 未税单价 */ - private Long beforePrice; + private BigDecimal beforePrice; /** * 税率 */ - private Long taxRate; + private BigDecimal taxRate; /** * 含税单价 */ - private Long includingPrice; + private BigDecimal includingPrice; /** * 小计 */ - private Long subtotal; + private BigDecimal subtotal; /** * 备注 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChangePaymentMethod.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChangePaymentMethod.java index 83865029..e5274fe5 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChangePaymentMethod.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChangePaymentMethod.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serial; +import java.math.BigDecimal; /** * 合同变更付款方式对象 erp_contract_change_payment_method @@ -45,22 +46,22 @@ public class ErpContractChangePaymentMethod extends TenantEntity { /** * 支付期限 */ - private Long paymentDeadline; + private BigDecimal paymentDeadline; /** * 支付比例 */ - private Long paymentPercentage; + private BigDecimal paymentPercentage; /** * 发票比例 */ - private Long invoicePercentage; + private BigDecimal invoicePercentage; /** * 支付金额 */ - private Long paymentAmount; + private BigDecimal paymentAmount; /** * 付款条款 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeBo.java index c3edba91..d81cfd08 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeBo.java @@ -8,6 +8,7 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -61,7 +62,7 @@ public class ErpContractChangeBo extends BaseEntity { /** * 合同金额 */ - private Long changeContractAmount; + private BigDecimal changeContractAmount; /** * 原合同编号 @@ -81,7 +82,7 @@ public class ErpContractChangeBo extends BaseEntity { /** * 原合同金额 */ - private Long originalContractAmount; + private BigDecimal originalContractAmount; /** * 变更原因 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeInfoBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeInfoBo.java index 4b92c5a9..96d49a92 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeInfoBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeInfoBo.java @@ -8,6 +8,7 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -80,7 +81,7 @@ public class ErpContractChangeInfoBo extends BaseEntity { /** * 合同总价 */ - private Long totalPrice; + private BigDecimal totalPrice; /** * 甲方公司 @@ -190,7 +191,7 @@ public class ErpContractChangeInfoBo extends BaseEntity { /** * 合同税率 */ - private Long taxRate; + private BigDecimal taxRate; /** * 签订地点 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeMaterialBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeMaterialBo.java index aa61d5c9..6ce0b5ae 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeMaterialBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeMaterialBo.java @@ -8,6 +8,7 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import java.math.BigDecimal; /** * 合同变更物料业务对象 erp_contract_change_material @@ -58,7 +59,7 @@ public class ErpContractChangeMaterialBo extends BaseEntity { /** * 数量 */ - private Long amount; + private BigDecimal amount; /** * 单位ID @@ -68,22 +69,22 @@ public class ErpContractChangeMaterialBo extends BaseEntity { /** * 未税单价 */ - private Long beforePrice; + private BigDecimal beforePrice; /** * 税率 */ - private Long taxRate; + private BigDecimal taxRate; /** * 含税单价 */ - private Long includingPrice; + private BigDecimal includingPrice; /** * 小计 */ - private Long subtotal; + private BigDecimal subtotal; /** * 备注 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangePaymentMethodBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangePaymentMethodBo.java index 55112c6e..6780ebe4 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangePaymentMethodBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangePaymentMethodBo.java @@ -8,6 +8,7 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import java.math.BigDecimal; /** * 合同变更付款方式业务对象 erp_contract_change_payment_method @@ -43,22 +44,22 @@ public class ErpContractChangePaymentMethodBo extends BaseEntity { /** * 支付期限 */ - private Long paymentDeadline; + private BigDecimal paymentDeadline; /** * 支付比例 */ - private Long paymentPercentage; + private BigDecimal paymentPercentage; /** * 发票比例 */ - private Long invoicePercentage; + private BigDecimal invoicePercentage; /** * 支付金额 */ - private Long paymentAmount; + private BigDecimal paymentAmount; /** * 付款条款 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeSaveBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeSaveBo.java index a13fdd7c..d4994ac1 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeSaveBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeSaveBo.java @@ -4,6 +4,9 @@ import lombok.Data; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; + +import java.math.BigDecimal; +import java.util.Date; import java.util.List; /** @@ -46,7 +49,7 @@ public class ErpContractChangeSaveBo { /** * 申请时间 */ - private java.util.Date applyTime; + private Date applyTime; /** * 承办部门 @@ -92,11 +95,11 @@ public class ErpContractChangeSaveBo { private String contractCode; private String contractName; private String originalCustomerName; - private Long originalContractAmount; + private BigDecimal originalContractAmount; private String changeContractCode; private String changeContractName; private String customerName; - private Long changeContractAmount; + private BigDecimal changeContractAmount; /** * 合同变更信息快照（内容变更时必填） diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangeInfoVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangeInfoVo.java index fc44dbcf..3dfa0836 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangeInfoVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangeInfoVo.java @@ -12,6 +12,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @@ -100,7 +101,7 @@ public class ErpContractChangeInfoVo implements Serializable { * 合同总价 */ @ExcelProperty(value = "合同总价") - private Long totalPrice; + private BigDecimal totalPrice; /** * 甲方公司 @@ -232,7 +233,7 @@ public class ErpContractChangeInfoVo implements Serializable { * 合同税率 */ @ExcelProperty(value = "合同税率") - private Long taxRate; + private BigDecimal taxRate; /** * 签订地点 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangeMaterialVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangeMaterialVo.java index 316f5819..f3807bdf 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangeMaterialVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangeMaterialVo.java @@ -10,6 +10,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @@ -74,7 +75,7 @@ public class ErpContractChangeMaterialVo implements Serializable { * 数量 */ @ExcelProperty(value = "数量") - private Long amount; + private BigDecimal amount; /** * 单位ID @@ -86,25 +87,25 @@ public class ErpContractChangeMaterialVo implements Serializable { * 未税单价 */ @ExcelProperty(value = "未税单价") - private Long beforePrice; + private BigDecimal beforePrice; /** * 税率 */ @ExcelProperty(value = "税率") - private Long taxRate; + private BigDecimal taxRate; /** * 含税单价 */ @ExcelProperty(value = "含税单价") - private Long includingPrice; + private BigDecimal includingPrice; /** * 小计 */ @ExcelProperty(value = "小计") - private Long subtotal; + private BigDecimal subtotal; /** * 备注 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangePaymentMethodVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangePaymentMethodVo.java index ec0c5300..0b446eb6 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangePaymentMethodVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangePaymentMethodVo.java @@ -10,6 +10,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @@ -56,25 +57,25 @@ public class ErpContractChangePaymentMethodVo implements Serializable { * 支付期限 */ @ExcelProperty(value = "支付期限") - private Long paymentDeadline; + private BigDecimal paymentDeadline; /** * 支付比例 */ @ExcelProperty(value = "支付比例") - private Long paymentPercentage; + private BigDecimal paymentPercentage; /** * 发票比例 */ @ExcelProperty(value = "发票比例") - private Long invoicePercentage; + private BigDecimal invoicePercentage; /** * 支付金额 */ @ExcelProperty(value = "支付金额") - private Long paymentAmount; + private BigDecimal paymentAmount; /** * 付款条款 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangeVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangeVo.java index 1a819ecf..132bde51 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangeVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangeVo.java @@ -12,6 +12,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @@ -77,7 +78,7 @@ public class ErpContractChangeVo implements Serializable { * 合同金额 */ @ExcelProperty(value = "合同金额") - private Long changeContractAmount; + private BigDecimal changeContractAmount; /** * 原合同编号 @@ -101,7 +102,7 @@ public class ErpContractChangeVo implements Serializable { * 原合同金额 */ @ExcelProperty(value = "原合同金额") - private Long originalContractAmount; + private BigDecimal originalContractAmount; /** * 变更原因 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractChangeServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractChangeServiceImpl.java index fbfa2c43..71044f39 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractChangeServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractChangeServiceImpl.java @@ -24,8 +24,10 @@ import org.dromara.oa.erp.domain.bo.ErpContractChangeSaveBo; import org.dromara.oa.erp.domain.vo.*; import org.dromara.oa.erp.mapper.*; import org.dromara.oa.erp.service.IErpContractChangeService; +import org.dromara.system.api.RemoteCodeRuleService; + +import org.apache.dubbo.config.annotation.DubboReference; -import java.math.BigDecimal; import java.util.Collection; import java.util.Date; import java.util.List; @@ -49,8 +51,13 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService { private final ErpContractMaterialMapper contractMaterialMapper; private final ErpContractPaymentMethodMapper contractPaymentMethodMapper; - /** 合同变更流程编码（审批通过后回写用） */ + @DubboReference + private RemoteCodeRuleService remoteCodeRuleService; + + /** 合同变更流程编码 */ public static final String FLOW_CODE_CONTRACT_CHANGE = "HTBG"; + /** 变更编号编码规则 */ + private static final String CONTRACT_CHANGE_CODE_RULE = "1021"; /** 变更类型：1内容变更 2解除合同 */ private static final String CHANGE_TYPE_CONTENT = "1"; @@ -201,8 +208,13 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService { deleteChangeSubByChangeId(main.getContractChangeId()); } } else { + if (StringUtils.isBlank(main.getChangeCode())) { + String changeCode = remoteCodeRuleService.selectCodeRuleCode(CONTRACT_CHANGE_CODE_RULE); + main.setChangeCode(changeCode); + } baseMapper.insert(main); bo.setContractChangeId(main.getContractChangeId()); + bo.setChangeCode(main.getChangeCode()); } if (CHANGE_TYPE_CONTENT.equals(bo.getChangeType())) { @@ -366,7 +378,7 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService { contract.setBusinessDirection(snap.getBusinessDirection()); contract.setContractDeptId(snap.getContractDeptId()); contract.setContractDate(snap.getContractDate()); - contract.setTotalPrice(toBigDecimal(snap.getTotalPrice())); + contract.setTotalPrice(snap.getTotalPrice()); contract.setOneCustomerId(snap.getOneCustomerId()); contract.setOneRepresent(snap.getOneRepresent()); contract.setOneDate(snap.getOneDate()); @@ -388,7 +400,7 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService { contract.setWarrantyPeriodDescription(snap.getWarrantyPeriodDescription()); contract.setDeliveryLocation(snap.getDeliveryLocation()); contract.setShipMethod(snap.getShipMethod()); - contract.setTaxRate(toBigDecimal(snap.getTaxRate())); + contract.setTaxRate(snap.getTaxRate()); contract.setSigningPlace(snap.getSigningPlace()); contract.setMaterialRemark(snap.getMaterialRemark()); contract.setContractTemplateFlag(snap.getContractTemplateFlag()); @@ -409,38 +421,28 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService { cm.setUnitId(m.getUnitId()); cm.setRemark(m.getRemark()); cm.setActiveFlag(StringUtils.isNotBlank(m.getActiveFlag()) ? m.getActiveFlag() : "1"); - cm.setAmount(toBigDecimal(m.getAmount())); - cm.setBeforePrice(toBigDecimal(m.getBeforePrice())); - cm.setTaxRate(toBigDecimal(m.getTaxRate())); - cm.setIncludingPrice(toBigDecimal(m.getIncludingPrice())); - cm.setSubtotal(toBigDecimal(m.getSubtotal())); + cm.setAmount(m.getAmount()); + cm.setBeforePrice(m.getBeforePrice()); + cm.setTaxRate(m.getTaxRate()); + cm.setIncludingPrice(m.getIncludingPrice()); + cm.setSubtotal(m.getSubtotal()); return cm; } - /** 变更付款方式快照转合同付款方式（回写），兼容 Long/Number 与 BigDecimal */ + /** 变更付款方式快照转合同付款方式（回写） */ private ErpContractPaymentMethod copyChangePaymentToContract(ErpContractChangePaymentMethod p, Long contractId) { ErpContractPaymentMethod cpm = new ErpContractPaymentMethod(); cpm.setContractId(contractId); cpm.setPaymentMethodId(null); cpm.setSortOrder(p.getSortOrder()); cpm.setPaymentStageId(p.getPaymentStageId()); - cpm.setPaymentDeadline(toBigDecimal(p.getPaymentDeadline())); - cpm.setPaymentPercentage(toBigDecimal(p.getPaymentPercentage())); - cpm.setInvoicePercentage(toBigDecimal(p.getInvoicePercentage())); - cpm.setPaymentAmount(toBigDecimal(p.getPaymentAmount())); + cpm.setPaymentDeadline(p.getPaymentDeadline()); + cpm.setPaymentPercentage(p.getPaymentPercentage()); + cpm.setInvoicePercentage(p.getInvoicePercentage()); + cpm.setPaymentAmount(p.getPaymentAmount()); cpm.setPaymentDescription(p.getPaymentDescription()); cpm.setRemark(p.getRemark()); cpm.setActiveFlag(StringUtils.isNotBlank(p.getActiveFlag()) ? p.getActiveFlag() : "1"); return cpm; } - - private static BigDecimal toBigDecimal(Number n) { - if (n == null) { - return null; - } - if (n instanceof BigDecimal) { - return (BigDecimal) n; - } - return BigDecimal.valueOf(n.doubleValue()); - } }