|
@@ -71,12 +71,12 @@ public class MeterReadingServiceImpl implements MeterReadingService {
|
|
|
SwBillManagementUnpaidDo unpaidDo = swBillManagementUnpaidService.getOne(new LambdaQueryWrapper<SwBillManagementUnpaidDo>()
|
|
|
.eq(SwBillManagementUnpaidDo::getUsernumber, userNumber)
|
|
|
.eq(SwBillManagementUnpaidDo::getYear, swWaterUsageEntryDo.getYear())
|
|
|
- .eq(SwBillManagementUnpaidDo::getPaymentrecordid, id));
|
|
|
+ .eq(SwBillManagementUnpaidDo::getWaterusageid, id));
|
|
|
// 已缴账单
|
|
|
SwBillManagementPaidDo paidDo = swBillManagementPaidService.getOne(new LambdaQueryWrapper<SwBillManagementPaidDo>()
|
|
|
.eq(SwBillManagementPaidDo::getUsernumber, userNumber)
|
|
|
.eq(SwBillManagementPaidDo::getYear, swWaterUsageEntryDo.getYear())
|
|
|
- .eq(SwBillManagementPaidDo::getPaymentrecordid, id));
|
|
|
+ .eq(SwBillManagementPaidDo::getWaterusageid, id));
|
|
|
if(paidDo!=null){
|
|
|
log.error("该账单已缴费");
|
|
|
return R.ok("该抄表记录已存在已缴账单,不允许删除");
|