From 9c49ede494a10d7e7a322eb2e793afa412ea07e1 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 24 八月 2026 09:35:40 +0800
Subject: [PATCH] feat:科室新增开票类型 水电房租标的物问题 机动车开票选项
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/MeterReadRecordServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/MeterReadRecordServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/MeterReadRecordServiceImpl.java
index f219846..baa79ff 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/MeterReadRecordServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/MeterReadRecordServiceImpl.java
@@ -16,6 +16,8 @@
import java.math.BigDecimal;
import java.util.List;
+;
+
/**
* 姘寸數鎶勮〃
*
@@ -98,6 +100,7 @@
schedule.setPaymentStatus(0);
schedule.setActualAmount(new BigDecimal("0"));
schedule.setInvoiceFlag("0");
+ schedule.setInvoiceNum(record.getUsageNum());
contractPaymentScheduleMapper.insert(schedule);
//鎴垮眿绉熻祦鐢熸垚搴旀敹
PaymentConfirm confirm = new PaymentConfirm();
@@ -131,13 +134,16 @@
confirm.setCompId(contract.getCompId());
paymentConfirmMapper.insert(confirm);
}
+ contract.setBillingStatus("2");
+ contract.setAmount(contract.getAmount().add(confirm.getTransationAmount()));
+ contractMapper.updateById(contract);
//鍒ゆ柇 寰幆鏄惁瀹屾垚
List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery().eq(ContractExecDate::getContractId,contract.getId())
.eq(ContractExecDate::getGenFlag,"0"));
List<MeterReadRecord> recordList = baseMapper.selectList(Wrappers.<MeterReadRecord>lambdaQuery()
.eq(MeterReadRecord::getContractId,contract.getId())
.isNull(MeterReadRecord::getMeterReadNum));
- if (ArrayUtil.isEmpty(execDateList.toArray())&&ArrayUtil.isEmpty(recordList.toArray())){
+ if (ArrayUtil.isEmpty(execDateList)&&ArrayUtil.isEmpty(recordList)){
List<PaymentConfirm> confirmList = paymentConfirmMapper.selectList(Wrappers.<PaymentConfirm>lambdaQuery()
.eq(PaymentConfirm::getContractId, contract.getId())
.and(wrapper -> wrapper
@@ -147,7 +153,7 @@
.or()
.eq(PaymentConfirm::getBusinessType, "涓嶅緛绋庤嚜鏉ユ按搴旀敹")
));
- if (ArrayUtil.isNotEmpty(confirmList.toArray())){
+ if (ArrayUtil.isNotEmpty(confirmList)){
BigDecimal total = confirmList.stream().map(PaymentConfirm::getTransationAmount).filter(amount -> amount != null).reduce(BigDecimal.ZERO, BigDecimal::add);
contract.setAmount(total);
contractMapper.updateById(contract);
--
Gitblit v1.9.1