|
|
@@ -644,39 +644,37 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
roles.add(AFTConstants.FINANCE);
|
|
|
roles.add(AFTConstants.FINANCE_MANAGER);
|
|
|
List<Admin> admins = adminMapper.selectAdminByRoleTypes(roles);
|
|
|
-
|
|
|
+ List<FinanceCount> list=new ArrayList<>();
|
|
|
for (Admin admin : admins){
|
|
|
- List<FinanceCount> list=new ArrayList<>();
|
|
|
+ List<FinanceCount> aList=new ArrayList<>();
|
|
|
List<FinanceCount> orderList = TOrderNewMapper.selectCountByFinance(admin.getId());
|
|
|
if (!orderList.isEmpty()){
|
|
|
-
|
|
|
- list.addAll(orderList);
|
|
|
+ aList.addAll(orderList);
|
|
|
}
|
|
|
List<FinanceCount> expenseList = expenseAccountMapper.selectCountByFinance(admin.getId());
|
|
|
- pushFinanceList(list, expenseList,0);
|
|
|
+ pushFinanceList(aList, expenseList,0);
|
|
|
List<FinanceCount> invoiceList =tOrderInvoiceMapper.selectCountByFinance(admin.getId());
|
|
|
- pushFinanceList(list, invoiceList,1);
|
|
|
+ pushFinanceList(aList, invoiceList,1);
|
|
|
List<FinanceCount> memberList =tTaskMemberMapper.selectCountByFinance(admin.getId());
|
|
|
- pushFinanceList(list, memberList,2);
|
|
|
+ pushFinanceList(aList, memberList,2);
|
|
|
List<FinanceCount> paymentList =tOrderPaymentMapper.selectCountByFinance(admin.getId());
|
|
|
- pushFinanceList(list, paymentList,3);
|
|
|
- List<FinanceCount> addList=new ArrayList<>();
|
|
|
- for (int i = 0; i <list.size(); i++) {
|
|
|
- FinanceCount financeCount = list.get(i);
|
|
|
- FinanceCount newFc=FinanceCount.initialization(financeCount);
|
|
|
- addList.add(newFc);
|
|
|
- if (addList.size()==50||i==list.size()-1){
|
|
|
- financeCountMapper.insetBatch(addList);
|
|
|
- addList.clear();
|
|
|
- try {
|
|
|
- Thread.sleep(500);
|
|
|
- } catch (InterruptedException exception) {
|
|
|
- exception.printStackTrace();
|
|
|
- }
|
|
|
+ pushFinanceList(aList, paymentList,3);
|
|
|
+ list.addAll(aList);
|
|
|
+ }
|
|
|
+ List<FinanceCount> addList=new ArrayList<>();
|
|
|
+ for (int i = 0; i <list.size(); i++) {
|
|
|
+ FinanceCount financeCount = list.get(i);
|
|
|
+ FinanceCount newFc=FinanceCount.initialization(financeCount);
|
|
|
+ addList.add(newFc);
|
|
|
+ if (addList.size()==50||i==list.size()-1){
|
|
|
+ financeCountMapper.insetBatch(addList);
|
|
|
+ addList.clear();
|
|
|
+ try {
|
|
|
+ Thread.sleep(500);
|
|
|
+ } catch (InterruptedException exception) {
|
|
|
+ exception.printStackTrace();
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
return 1;
|
|
|
}
|