Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/wexintheorder/utils/TheOrderExportExcel.java

@@ -187,7 +187,7 @@ public class TheOrderExportExcel {
                 cell.setCellValue("");
             }
         }
-
+        Integer headcount = 0;
         // 遍历创建行,导出数据
         for (int rownum = 1; rownum <= theOrderListCountByDepartment.size(); rownum++) {
             Row cells = this.addRow();
@@ -195,7 +195,13 @@ public class TheOrderExportExcel {
             this.addCell(cells, 1, theOrderListCountByDepartment.get(rownum - 1).getTeam(), 2, null);
             this.addCell(cells, 2, theOrderListCountByDepartment.get(rownum - 1).getDepartment(), 2, null);
             this.addCell(cells, 3, theOrderListCountByDepartment.get(rownum - 1).getNumber(), 2, null);
+            headcount+= Integer.valueOf(theOrderListCountByDepartment.get(rownum - 1).getNumber());
         }
+        Row collectCell = this.addRow();
+        this.addCell(collectCell, 0, "", 2, null);
+        this.addCell(collectCell, 1, "", 2, null);
+        this.addCell(collectCell, 2, "汇总(人数)", 2, null);
+        this.addCell(collectCell, 3, Integer.toString(headcount), 2, null);
 
         for (TheOrderLeadership theOrder: theOrderList) {
             this.sheet = wb.createSheet(theOrder.getLeadership());