wangchengming/Contract-Manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
李文飞 2025-12-15 20:53:18 +08:00
parent 5fbb24fab7
commit e6457b4846
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/application.yml
View File

@ -75,7 +75,7 @@ spring:
basename: i18n/messages basename: i18n/messages
profiles: profiles:
# active: dev # active: dev
active: dev active: prod
# 文件上传 # 文件上传
servlet: servlet:
multipart: multipart:

2
ruoyi-system/src/main/java/com/ruoyi/contract/domain/bo/ConSaleMediaBo.java
View File

@ -203,5 +203,5 @@ public class ConSaleMediaBo extends BaseEntityAdd {
*/ */
@CustomBaenAnnotation(value = "其他返点金额2") @CustomBaenAnnotation(value = "其他返点金额2")
@Digits(integer = 15,fraction = 4,message = "其他返点金额2最多允许15位整数,4位小数") @Digits(integer = 15,fraction = 4,message = "其他返点金额2最多允许15位整数,4位小数")
private BigDecimal otherReverMoney2; private Double otherReverMoney2;
} }

2
ruoyi-system/src/main/java/com/ruoyi/contract/domain/dto/ConSaleImportDto.java
View File

@ -89,7 +89,7 @@ public class ConSaleImportDto implements Serializable {
private String otherReverPoit2 = "0"; private String otherReverPoit2 = "0";
@Alias("其他返点金额2") @Alias("其他返点金额2")
private BigDecimal otherReverMoney2 = BigDecimal.ZERO; private Double otherReverMoney2 = 0.0;
@Alias("开票时间") @Alias("开票时间")
private String invoiceDate; private String invoiceDate;

2
ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConSaleMediaVo.java
View File

@ -186,5 +186,5 @@ public class ConSaleMediaVo {
* 其他返点金额2 * 其他返点金额2
*/ */
@ExcelProperty(value = "其他返点金额2") @ExcelProperty(value = "其他返点金额2")
private BigDecimal otherReverMoney2; private Double otherReverMoney2;
} }

2
ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConSaleServiceImpl.java
View File

@ -233,7 +233,7 @@ public class ConSaleServiceImpl implements IConSaleService {
mediaBo.setOtherReverPoit(StrUtil.isNotBlank(row.getOtherReverPoit()) ? row.getOtherReverPoit() : "0"); mediaBo.setOtherReverPoit(StrUtil.isNotBlank(row.getOtherReverPoit()) ? row.getOtherReverPoit() : "0");
mediaBo.setOtherReverMoney(ObjectUtil.isNotNull(row.getOtherReverMoney()) ? row.getOtherReverMoney() : 0.0); mediaBo.setOtherReverMoney(ObjectUtil.isNotNull(row.getOtherReverMoney()) ? row.getOtherReverMoney() : 0.0);
mediaBo.setOtherReverPoit2(StrUtil.isNotBlank(row.getOtherReverPoit2()) ? row.getOtherReverPoit2() : "0"); mediaBo.setOtherReverPoit2(StrUtil.isNotBlank(row.getOtherReverPoit2()) ? row.getOtherReverPoit2() : "0");
mediaBo.setOtherReverMoney2(ObjectUtil.isNotNull(row.getOtherReverMoney2()) ? row.getOtherReverMoney2() : BigDecimal.ZERO); mediaBo.setOtherReverMoney2(ObjectUtil.isNotNull(row.getOtherReverMoney2()) ? row.getOtherReverMoney2() : 0.0);
// 解析日期 // 解析日期
try { try {