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