Jelajahi Sumber

批量导入费用报销数据修改

yurk 2 tahun lalu
induk
melakukan
618e49e8bb

+ 2 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ExpenseSheetServiceImpl.java

@@ -333,11 +333,12 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                     if(codeCell==null){
                         continue;
                     }
-                    if(happenDateCell==null){
+                    if(happenDateCell.toString().trim().equals("")||happenDateCell==null){
                         msg.setError("费用日期不能为空");
                         return msg;
                     }
                     ExpenseItem expenseItem = new ExpenseItem();
+                    System.out.println(codeCell.getStringCellValue());
                     Optional<Project> project = projectList.stream().filter(pro ->(StringUtils.isEmpty(pro.getProjectCode())?"":pro.getProjectCode()).equals(codeCell.getStringCellValue())
                             || (StringUtils.isEmpty(pro.getProjectName())?"":pro.getProjectName()).equals(codeCell.getStringCellValue())).findFirst();
                     if (project.isPresent()) {