Merge branch 'zx-2023-04-13' of http://git.dayaedu.com/yonge/mec into saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/FinancialExpenditureServiceImpl.java

@@ -402,6 +402,7 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
                                                 Object o = hashMap.get(inputDto.getModel());
                                                 if (Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())) {
                                                     financialExpenditure.setAmount(financialExpenditure.getAmount().add(new BigDecimal(Double.parseDouble(o.toString()))));
+                                                    financialExpenditure.setCurrentAmount(financialExpenditure.getAmount());
                                                     continue;
                                                 }
                                             } else if (name.contains("情况说明") || name.contains("事由")) {
@@ -537,6 +538,7 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
                         Object o = formData.get(oaInputDto.getModel());
                         if(Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())){
                             financialExpenditure.setAmount(new BigDecimal(Double.parseDouble(o.toString())));
+                            financialExpenditure.setCurrentAmount(financialExpenditure.getAmount());
                             continue;
                         }
                     }else if(name.contains("情况说明")){
@@ -630,6 +632,7 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
                                         Object o = hashMap.get(inputDto.getModel());
                                         if(Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())){
                                             financialExpenditure.setAmount(new BigDecimal(Double.parseDouble(o.toString())));
+                                            financialExpenditure.setCurrentAmount(financialExpenditure.getAmount());
                                             continue;
                                         }
                                     }