经营报表oa

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

@@ -387,10 +387,12 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
                                             } else if (StringUtils.equals(name,"支出类型")) {
                                                 financialExpenditure.setType(ExpenditureTypeEnum.valueOfDesc(o.toString()));
                                             } else if (StringUtils.equals(name,"费用类型") || StringUtils.equals(name,"费用类别")) {
-                                                financialExpenditure.setFeeProject(FeeProjectEnum.valueOfDesc(o.toString()));
-                                            } else if (StringUtils.equals(name,"住宿费")) {
-                                                financialExpenditure.setFeeProject(FeeProjectEnum.valueOfDesc(o.toString()));
-                                            } else if (StringUtils.equals(name,"日期") || StringUtils.equals(name,"费用发生日期")) {
+                                                FeeProjectEnum projectEnum = FeeProjectEnum.valueOfDesc(o.toString());
+                                                if(projectEnum == null){
+                                                    projectEnum = feeProjectEnum;
+                                                }
+                                                financialExpenditure.setFeeProject(projectEnum);
+                                            }else if (StringUtils.equals(name,"日期") || StringUtils.equals(name,"费用发生日期")) {
                                                 financialExpenditure.setPaymentTime(DateUtil.stringToDate(o.toString(),DateUtil.DEFAULT_PATTERN));
                                             } else if (StringUtils.equals(name,"费用分摊月份")) {
                                                 financialExpenditure.setEffectiveTime(o.toString());