|
|
@@ -463,6 +463,7 @@ public class BpmElderlyChangeApiImpl implements BpmElderlyChangeApi {
|
|
|
ExpenseOrderDO expenseOrder = expenseOrderMapper.selectOne(new LambdaQueryWrapperX<ExpenseOrderDO>()
|
|
|
.eq(ExpenseOrderDO::getElderId, elderlyId)
|
|
|
.eq(ExpenseOrderDO::getBillingMonth, changeBillingMonth)
|
|
|
+ .eq(ExpenseOrderDO::getPayStatus,BooleanEnum.FALSE.getValue())
|
|
|
.ne(ExpenseOrderDO::getType,4));
|
|
|
if(expenseOrder == null){
|
|
|
String targetBillingMonth = resolveAttributionBillMonth(changeBillingMonth, changeYearMonth, hysteresisYearMonth);
|
|
|
@@ -576,6 +577,7 @@ public class BpmElderlyChangeApiImpl implements BpmElderlyChangeApi {
|
|
|
ExpenseOrderDO expenseOrderDO = expenseOrderMapper.selectOne(new LambdaQueryWrapperX<ExpenseOrderDO>()
|
|
|
.eq(ExpenseOrderDO::getElderId, elderlyId)
|
|
|
.eq(ExpenseOrderDO::getBillingMonth, bedChangeRecordDO.getChangeDate().format(DateTimeFormatter.ofPattern("yyyy-MM")))
|
|
|
+ .eq(ExpenseOrderDO::getPayStatus,BooleanEnum.FALSE.getValue())
|
|
|
.eq(ExpenseOrderDO::getType, 2)
|
|
|
.eq(ExpenseOrderDO::getTenantId, startTenantId));
|
|
|
if (null == expenseOrderDO) {
|