|
@@ -1105,6 +1105,9 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
|
|
|
if (!StringUtils.isEmpty(sheet.getCode())) {
|
|
|
queryWrapper.eq("code", sheet.getCode());
|
|
|
}
|
|
|
+ if (sheet.getSendState()!=null) {
|
|
|
+ queryWrapper.eq("send_state", sheet.getSendState());
|
|
|
+ }
|
|
|
//增加状态
|
|
|
if (sheet.getStatus() != null) {
|
|
|
queryWrapper.eq("status", sheet.getStatus());
|
|
@@ -1134,6 +1137,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
|
|
|
titleList.add("总费用");
|
|
|
titleList.add("备注");
|
|
|
titleList.add("状态");
|
|
|
+ titleList.add("发放状态");
|
|
|
titleList.add("项目名称");
|
|
|
titleList.add("费用日期");
|
|
|
titleList.add("发票种类");
|
|
@@ -1192,6 +1196,17 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
|
|
|
default:
|
|
|
item.add("");
|
|
|
}
|
|
|
+ switch (record.getSendState()){
|
|
|
+ case 0:
|
|
|
+ item.add("未发放");
|
|
|
+ break;
|
|
|
+ case 1:
|
|
|
+ item.add("已发放");
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ item.add("");
|
|
|
+ }
|
|
|
+
|
|
|
Optional<Project> optional = projectList.stream().filter(p -> expenseItem.getProjectId() != null && p.getId().equals(expenseItem.getProjectId())).findFirst();
|
|
|
if(optional.isPresent()){
|
|
|
item.add(optional.get().getProjectName());
|