|
@@ -323,6 +323,7 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
|
|
}
|
|
}
|
|
}
|
|
}
|
|
financialExpenditure.setAprovalTime(endTime);
|
|
financialExpenditure.setAprovalTime(endTime);
|
|
|
|
+ financialExpenditure.setPaymentTime(endTime);
|
|
financialExpenditure.setAmount(totalAmount);
|
|
financialExpenditure.setAmount(totalAmount);
|
|
financialExpenditure.setCause(note);
|
|
financialExpenditure.setCause(note);
|
|
financialExpenditure.setBatchNo(pWorkOrderInfo.getId().toString());
|
|
financialExpenditure.setBatchNo(pWorkOrderInfo.getId().toString());
|
|
@@ -341,6 +342,7 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
|
|
for (HashMap hashMap : hashMaps) {
|
|
for (HashMap hashMap : hashMaps) {
|
|
FinancialExpenditure financialExpenditure = new FinancialExpenditure();
|
|
FinancialExpenditure financialExpenditure = new FinancialExpenditure();
|
|
financialExpenditure.setAprovalTime(endTime);
|
|
financialExpenditure.setAprovalTime(endTime);
|
|
|
|
+ financialExpenditure.setPaymentTime(endTime);
|
|
financialExpenditure.setBatchNo(pWorkOrderInfo.getId().toString());
|
|
financialExpenditure.setBatchNo(pWorkOrderInfo.getId().toString());
|
|
financialExpenditure.setFinancialProcessNo(pWorkOrderInfo.getId().toString());
|
|
financialExpenditure.setFinancialProcessNo(pWorkOrderInfo.getId().toString());
|
|
financialExpenditure.setApplyUser(realName);
|
|
financialExpenditure.setApplyUser(realName);
|
|
@@ -499,6 +501,7 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
|
|
if(CollectionUtils.isNotEmpty(financialExpenditures)){
|
|
if(CollectionUtils.isNotEmpty(financialExpenditures)){
|
|
for (FinancialExpenditure financialExpenditure : financialExpenditures) {
|
|
for (FinancialExpenditure financialExpenditure : financialExpenditures) {
|
|
financialExpenditure.setAprovalTime(endTime);
|
|
financialExpenditure.setAprovalTime(endTime);
|
|
|
|
+ financialExpenditure.setPaymentTime(endTime);
|
|
financialExpenditure.setApplyUser(realName);
|
|
financialExpenditure.setApplyUser(realName);
|
|
financialExpenditure.setType(ExpenditureTypeEnum.REFUND);
|
|
financialExpenditure.setType(ExpenditureTypeEnum.REFUND);
|
|
financialExpenditure.setFeeProject(FeeProjectEnum.REFUND);
|
|
financialExpenditure.setFeeProject(FeeProjectEnum.REFUND);
|
|
@@ -515,6 +518,7 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
|
|
}else {
|
|
}else {
|
|
FinancialExpenditure financialExpenditure = new FinancialExpenditure();
|
|
FinancialExpenditure financialExpenditure = new FinancialExpenditure();
|
|
financialExpenditure.setAprovalTime(endTime);
|
|
financialExpenditure.setAprovalTime(endTime);
|
|
|
|
+ financialExpenditure.setPaymentTime(endTime);
|
|
financialExpenditure.setBatchNo(workOrderId.toString());
|
|
financialExpenditure.setBatchNo(workOrderId.toString());
|
|
financialExpenditure.setFinancialProcessNo(workOrderId.toString());
|
|
financialExpenditure.setFinancialProcessNo(workOrderId.toString());
|
|
financialExpenditure.setApplyUser(realName);
|
|
financialExpenditure.setApplyUser(realName);
|