|
|
@@ -1289,8 +1289,21 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
"selectExpenseAccountTotalAmount", param, in.getPageNo(), in.getPageSize());
|
|
|
List<OutExpenseAccountBo> list = (List<OutExpenseAccountBo>) pagePlus.getList();
|
|
|
for (OutExpenseAccountBo e : list) {
|
|
|
+ //设定是否需要审核
|
|
|
e.setExamine(pushExpenseAccountGetExamine(e.getId(), e.getProcessStatus()));
|
|
|
-
|
|
|
+ //设定是否完成订单匹配
|
|
|
+ List<ExpenseAccount> expenseAccounts = expenseAccountMapper.selectListByMainId(e.getId());
|
|
|
+ int count = 0;
|
|
|
+ for (ExpenseAccount e2 : expenseAccounts) {
|
|
|
+ if(e2.getOrderNo()!=null){
|
|
|
+ count++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (count==expenseAccounts.size()){
|
|
|
+ e.setFullyAllocate(1);
|
|
|
+ }else {
|
|
|
+ e.setFullyAllocate(0);
|
|
|
+ }
|
|
|
}
|
|
|
return pagePlus;
|
|
|
}
|