anderx лет назад: 2
Родитель
Сommit
9e87e32e93

+ 21 - 23
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -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;
 	}

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderInvoiceMapper.xml

@@ -634,7 +634,7 @@ where a.status=2 and a.order_no=  #{orderNo,jdbcType=VARCHAR}
                    left join department c on
               b.order_dep = c.id
             where a.status in (1, 2) and a.approval in (0,2)
-              and c.finance_id = '060583e4-82a2-4f72-8141-ae44806844e7')x
+              and c.finance_id = #{aid})x
       group by x.aid,x.dates
     </select>
 

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TTaskMemberMapper.xml

@@ -163,7 +163,7 @@
     where tid = #{id,jdbcType=INTEGER}
   </select>
     <select id="selectCountByFinance" resultType="com.goafanti.common.model.FinanceCount">
-      SELECT x.aid,x.dates,count(*) memberCount,sum(if(x.process_status=1,1,0))memberUnauditedCount
+      SELECT x.aid,x.dates dateTime,count(*) memberCount,sum(if(x.process_status=1,1,0))memberUnauditedCount
       from (select d.finance_id aid ,b.process_status ,DATE_FORMAT(a.create_time , '%Y-%m-%d') dates
             from t_task_member a left join t_order_task b on a.tid =b.id
                                  left join t_order_new c on b.order_no =c.order_no