Merge remote-tracking branch 'origin/master'

common/src/main/java/com/winsun/bean/YrymReport.java

+package com.winsun.bean;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 一人一码发展统计表entity
+ *
+ * @Author LiuRunYuan
+ * @CreateDate 2020/03/06
+ */
+public class YrymReport {
+
+    public static List<String> subNameList = new ArrayList<String>() {
+        {
+            add("天河");
+            add("白云");
+            add("番禺");
+            add("海珠");
+            add("荔湾");
+            add("黄埔");
+            add("增城");
+            add("花都");
+            add("东山");
+            add("从化");
+            add("本部");
+        }
+    };
+
+    private String subName;         //县分
+    private Integer schoolNum = 0;      //学校数
+    private Integer studentNum = 0;     //学生数
+
+    private Integer newUserNumWeek = 0;     //新增-新用户
+    private Integer newAloneNumWeek = 0;    //新增-单宽带
+    private Integer newMixNumWeek = 0;      //新增-融合宽带
+    private Integer oldUserNumWeek = 0;     //存量-老用户办理
+    private Integer oldContinueNumWeek = 0; //存量-老用户续约
+    private Integer finishNewNumWeek = 0;   //已竣工-新增
+    private Integer finishOldNumWeek = 0;   //已竣工-存量
+    private Integer sumWeek = 0;            //总计
+
+    private Integer newUserNumMonth = 0;
+    private Integer newAloneNumMonth = 0;
+    private Integer newMixNumMonth = 0;
+    private Integer oldUserNumMonth = 0;
+    private Integer oldContinueNumMonth = 0;
+    private Integer finishNewNumMonth = 0;
+    private Integer finishOldNumMonth = 0;
+    private Integer sumMonth = 0;
+
+    private Integer newUserNumAll = 0;
+    private Integer newAloneNumAll = 0;
+    private Integer newMixNumAll = 0;
+    private Integer oldUserNumAll = 0;
+    private Integer oldContinueNumAll = 0;
+    private Integer finishNewNumAll = 0;
+    private Integer finishOldNumAll = 0;
+    private Integer sumAll = 0;
+
+    public YrymReport() {
+    }
+
+    public void setDataBytype(Map<String, Object> map, String type) {
+        switch (type) {
+            case "week":
+                newUserNumWeek = Integer.valueOf(map.get("newUserNum").toString());
+                newAloneNumWeek = Integer.valueOf(map.get("newAloneNum").toString());
+                newMixNumWeek = Integer.valueOf(map.get("newMixNum").toString());
+                oldUserNumWeek = Integer.valueOf(map.get("oldUserNum").toString());
+                oldContinueNumWeek = Integer.valueOf(map.get("oldContinueNum").toString());
+                finishNewNumWeek = Integer.valueOf(map.get("finishNewNum").toString());
+                finishOldNumWeek = Integer.valueOf(map.get("finishOldNum").toString());
+                sumWeek = Integer.valueOf(map.get("sum").toString());
+                break;
+            case "month":
+                newUserNumMonth = Integer.valueOf(map.get("newUserNum").toString());
+                newAloneNumMonth = Integer.valueOf(map.get("newAloneNum").toString());
+                newMixNumMonth = Integer.valueOf(map.get("newMixNum").toString());
+                oldUserNumMonth = Integer.valueOf(map.get("oldUserNum").toString());
+                oldContinueNumMonth = Integer.valueOf(map.get("oldContinueNum").toString());
+                finishNewNumMonth = Integer.valueOf(map.get("finishNewNum").toString());
+                finishOldNumMonth = Integer.valueOf(map.get("finishOldNum").toString());
+                sumMonth = Integer.valueOf(map.get("sum").toString());
+                break;
+            case "all":
+                newUserNumAll = Integer.valueOf(map.get("newUserNum").toString());
+                newAloneNumAll = Integer.valueOf(map.get("newAloneNum").toString());
+                newMixNumAll = Integer.valueOf(map.get("newMixNum").toString());
+                oldUserNumAll = Integer.valueOf(map.get("oldUserNum").toString());
+                oldContinueNumAll = Integer.valueOf(map.get("oldContinueNum").toString());
+                finishNewNumAll = Integer.valueOf(map.get("finishNewNum").toString());
+                finishOldNumAll = Integer.valueOf(map.get("finishOldNum").toString());
+                sumAll = Integer.valueOf(map.get("sum").toString());
+                break;
+        }
+    }
+
+    public String getSubName() {
+        return subName;
+    }
+
+    public void setSubName(String subName) {
+        this.subName = subName;
+    }
+
+    public Integer getSchoolNum() {
+        return schoolNum;
+    }
+
+    public void setSchoolNum(Integer schoolNum) {
+        this.schoolNum = schoolNum;
+    }
+
+    public Integer getStudentNum() {
+        return studentNum;
+    }
+
+    public void setStudentNum(Integer studentNum) {
+        this.studentNum = studentNum;
+    }
+
+    public Integer getNewUserNumWeek() {
+        return newUserNumWeek;
+    }
+
+    public void setNewUserNumWeek(Integer newUserNumWeek) {
+        this.newUserNumWeek = newUserNumWeek;
+    }
+
+    public Integer getNewAloneNumWeek() {
+        return newAloneNumWeek;
+    }
+
+    public void setNewAloneNumWeek(Integer newAloneNumWeek) {
+        this.newAloneNumWeek = newAloneNumWeek;
+    }
+
+    public Integer getNewMixNumWeek() {
+        return newMixNumWeek;
+    }
+
+    public void setNewMixNumWeek(Integer newMixNumWeek) {
+        this.newMixNumWeek = newMixNumWeek;
+    }
+
+    public Integer getOldUserNumWeek() {
+        return oldUserNumWeek;
+    }
+
+    public void setOldUserNumWeek(Integer oldUserNumWeek) {
+        this.oldUserNumWeek = oldUserNumWeek;
+    }
+
+    public Integer getOldContinueNumWeek() {
+        return oldContinueNumWeek;
+    }
+
+    public void setOldContinueNumWeek(Integer oldContinueNumWeek) {
+        this.oldContinueNumWeek = oldContinueNumWeek;
+    }
+
+    public Integer getFinishNewNumWeek() {
+        return finishNewNumWeek;
+    }
+
+    public void setFinishNewNumWeek(Integer finishNewNumWeek) {
+        this.finishNewNumWeek = finishNewNumWeek;
+    }
+
+    public Integer getFinishOldNumWeek() {
+        return finishOldNumWeek;
+    }
+
+    public void setFinishOldNumWeek(Integer finishOldNumWeek) {
+        this.finishOldNumWeek = finishOldNumWeek;
+    }
+
+    public Integer getSumWeek() {
+        return sumWeek;
+    }
+
+    public void setSumWeek(Integer sumWeek) {
+        this.sumWeek = sumWeek;
+    }
+
+    public Integer getNewUserNumMonth() {
+        return newUserNumMonth;
+    }
+
+    public void setNewUserNumMonth(Integer newUserNumMonth) {
+        this.newUserNumMonth = newUserNumMonth;
+    }
+
+    public Integer getNewAloneNumMonth() {
+        return newAloneNumMonth;
+    }
+
+    public void setNewAloneNumMonth(Integer newAloneNumMonth) {
+        this.newAloneNumMonth = newAloneNumMonth;
+    }
+
+    public Integer getNewMixNumMonth() {
+        return newMixNumMonth;
+    }
+
+    public void setNewMixNumMonth(Integer newMixNumMonth) {
+        this.newMixNumMonth = newMixNumMonth;
+    }
+
+    public Integer getOldUserNumMonth() {
+        return oldUserNumMonth;
+    }
+
+    public void setOldUserNumMonth(Integer oldUserNumMonth) {
+        this.oldUserNumMonth = oldUserNumMonth;
+    }
+
+    public Integer getOldContinueNumMonth() {
+        return oldContinueNumMonth;
+    }
+
+    public void setOldContinueNumMonth(Integer oldContinueNumMonth) {
+        this.oldContinueNumMonth = oldContinueNumMonth;
+    }
+
+    public Integer getFinishNewNumMonth() {
+        return finishNewNumMonth;
+    }
+
+    public void setFinishNewNumMonth(Integer finishNewNumMonth) {
+        this.finishNewNumMonth = finishNewNumMonth;
+    }
+
+    public Integer getFinishOldNumMonth() {
+        return finishOldNumMonth;
+    }
+
+    public void setFinishOldNumMonth(Integer finishOldNumMonth) {
+        this.finishOldNumMonth = finishOldNumMonth;
+    }
+
+    public Integer getSumMonth() {
+        return sumMonth;
+    }
+
+    public void setSumMonth(Integer sumMonth) {
+        this.sumMonth = sumMonth;
+    }
+
+    public Integer getNewUserNumAll() {
+        return newUserNumAll;
+    }
+
+    public void setNewUserNumAll(Integer newUserNumAll) {
+        this.newUserNumAll = newUserNumAll;
+    }
+
+    public Integer getNewAloneNumAll() {
+        return newAloneNumAll;
+    }
+
+    public void setNewAloneNumAll(Integer newAloneNumAll) {
+        this.newAloneNumAll = newAloneNumAll;
+    }
+
+    public Integer getNewMixNumAll() {
+        return newMixNumAll;
+    }
+
+    public void setNewMixNumAll(Integer newMixNumAll) {
+        this.newMixNumAll = newMixNumAll;
+    }
+
+    public Integer getOldUserNumAll() {
+        return oldUserNumAll;
+    }
+
+    public void setOldUserNumAll(Integer oldUserNumAll) {
+        this.oldUserNumAll = oldUserNumAll;
+    }
+
+    public Integer getOldContinueNumAll() {
+        return oldContinueNumAll;
+    }
+
+    public void setOldContinueNumAll(Integer oldContinueNumAll) {
+        this.oldContinueNumAll = oldContinueNumAll;
+    }
+
+    public Integer getFinishNewNumAll() {
+        return finishNewNumAll;
+    }
+
+    public void setFinishNewNumAll(Integer finishNewNumAll) {
+        this.finishNewNumAll = finishNewNumAll;
+    }
+
+    public Integer getFinishOldNumAll() {
+        return finishOldNumAll;
+    }
+
+    public void setFinishOldNumAll(Integer finishOldNumAll) {
+        this.finishOldNumAll = finishOldNumAll;
+    }
+
+    public Integer getSumAll() {
+        return sumAll;
+    }
+
+    public void setSumAll(Integer sumAll) {
+        this.sumAll = sumAll;
+    }
+}

deploy/prod/winsun-docker-application-list/docker-compose.yml

@@ -24,7 +24,9 @@ services:
     deploy:
     deploy:
       resources:
       resources:
         limits:
         limits:
-          memory: 128M
+          memory: 400M
+        reservations:
+          memory: 100M
   gateway:
   gateway:
     image: gateway
     image: gateway
     container_name: gateway
     container_name: gateway
@@ -39,7 +41,9 @@ services:
     deploy:
     deploy:
       resources:
       resources:
         limits:
         limits:
-          memory: 256M
+          memory: 500M
+        reservations:
+          memory: 100M
   core:
   core:
     image: core
     image: core
     container_name: core
     container_name: core
@@ -54,7 +58,9 @@ services:
     deploy:
     deploy:
       resources:
       resources:
         limits:
         limits:
-          memory: 512M
+          memory: 800M
+        reservations:
+          memory: 100M
   gdtelgztelschoolcentermanager:
   gdtelgztelschoolcentermanager:
     image: gdtelgztelschoolcentermanager
     image: gdtelgztelschoolcentermanager
     container_name: gdtelgztelschoolcentermanager
     container_name: gdtelgztelschoolcentermanager
@@ -71,7 +77,9 @@ services:
     deploy:
     deploy:
       resources:
       resources:
         limits:
         limits:
-          memory: 256M
+          memory: 500M
+        reservations:
+          memory: 100M
   gdtelgztelschoolcentertask:
   gdtelgztelschoolcentertask:
     image: gdtelgztelschoolcentertask
     image: gdtelgztelschoolcentertask
     container_name: gdtelgztelschoolcentertask
     container_name: gdtelgztelschoolcentertask
@@ -89,7 +97,9 @@ services:
     deploy:
     deploy:
       resources:
       resources:
         limits:
         limits:
-          memory: 256M
+          memory: 500M
+        reservations:
+          memory: 100M
   gdtelgztelschoolcenterapplynet:
   gdtelgztelschoolcenterapplynet:
     image: gdtelgztelschoolcenterapplynet
     image: gdtelgztelschoolcenterapplynet
     container_name: gdtelgztelschoolcenterapplynet
     container_name: gdtelgztelschoolcenterapplynet
@@ -106,7 +116,9 @@ services:
     deploy:
     deploy:
       resources:
       resources:
         limits:
         limits:
-          memory: 256M
+          memory: 500M
+        reservations:
+          memory: 100M
   gdtelgztelschoolcenternewuser:
   gdtelgztelschoolcenternewuser:
     image: gdtelgztelschoolcenternewuser
     image: gdtelgztelschoolcenternewuser
     container_name: gdtelgztelschoolcenternewuser
     container_name: gdtelgztelschoolcenternewuser
@@ -123,7 +135,9 @@ services:
     deploy:
     deploy:
       resources:
       resources:
         limits:
         limits:
-          memory: 256M
+          memory: 500M
+        reservations:
+          memory: 100M
   gdtelgztelschoolcenterolduser:
   gdtelgztelschoolcenterolduser:
     image: gdtelgztelschoolcenterolduser
     image: gdtelgztelschoolcenterolduser
     container_name: gdtelgztelschoolcenterolduser
     container_name: gdtelgztelschoolcenterolduser
@@ -140,24 +154,9 @@ services:
     deploy:
     deploy:
       resources:
       resources:
         limits:
         limits:
-          memory: 256M
-  gdtelgztelschoolcenterrenewaluser:
-    image: gdtelgztelschoolcenterrenewaluser
-    container_name: gdtelgztelschoolcenterrenewaluser
-    build:
-      context: gdtel-gztel-school-center/renewaluser/
-      dockerfile: Dockerfile
-    ports:
-      - "11095:11095"
-    depends_on:
-      - rabbitmq
-      - eureka
-      - redis
-      - core
-    deploy:
-      resources:
-        limits:
-          memory: 256M
+          memory: 500M
+        reservations:
+          memory: 100M
   gdtelgztelschoolcenterui:
   gdtelgztelschoolcenterui:
     image: gdtelgztelschoolcenterui
     image: gdtelgztelschoolcenterui
     container_name: gdtelgztelschoolcenterui
     container_name: gdtelgztelschoolcenterui
@@ -175,7 +174,9 @@ services:
     deploy:
     deploy:
       resources:
       resources:
         limits:
         limits:
-          memory: 128M
+          memory: 200M
+        reservations:
+          memory: 100M
   winsunoaui:
   winsunoaui:
     image: winsunoaui
     image: winsunoaui
     container_name: winsunoaui
     container_name: winsunoaui
@@ -193,7 +194,9 @@ services:
     deploy:
     deploy:
       resources:
       resources:
         limits:
         limits:
-          memory: 128M
+          memory: 200M
+        reservations:
+          memory: 100M
   winsunoareport:
   winsunoareport:
     image: winsunoareport
     image: winsunoareport
     container_name: winsunoareport
     container_name: winsunoareport
@@ -210,4 +213,6 @@ services:
     deploy:
     deploy:
       resources:
       resources:
         limits:
         limits:
-          memory: 256M
+          memory: 500M
+        reservations:
+          memory: 100M
\ No newline at end of file

deploy/prod/winsun-docker-application-list/gdtel-gztel-school-center/applynet/Dockerfile

 FROM openjdk:8-jre-alpine
 FROM openjdk:8-jre-alpine
-LABEL maintainer="Liph <liph@gzwinsun.com>" app="applynet"
+LABEL maintainer="Liph <liph@gzwinsun.com>" app="gdtelgztelschoolcenterapplynet"
 ENV JAR_NAME=applynet \
 ENV JAR_NAME=applynet \
     TZ=Asia/Shanghai
     TZ=Asia/Shanghai
 COPY $JAR_NAME.jar $JAR_NAME.jar
 COPY $JAR_NAME.jar $JAR_NAME.jar

deploy/prod/winsun-docker-application-list/gdtel-gztel-school-center/manager/Dockerfile

 FROM openjdk:8-jre-alpine
 FROM openjdk:8-jre-alpine
-LABEL maintainer="Liph <liph@gzwinsun.com>" app="manager"
+LABEL maintainer="Liph <liph@gzwinsun.com>" app="gdtelgztelschoolcentermanager"
 ENV JAR_NAME=manager \
 ENV JAR_NAME=manager \
     TZ=Asia/Shanghai
     TZ=Asia/Shanghai
 COPY $JAR_NAME.jar $JAR_NAME.jar
 COPY $JAR_NAME.jar $JAR_NAME.jar

deploy/prod/winsun-docker-application-list/gdtel-gztel-school-center/newuser/Dockerfile

 FROM openjdk:8-jre-alpine
 FROM openjdk:8-jre-alpine
-LABEL maintainer="Liph <liph@gzwinsun.com>" app="newuser"
+LABEL maintainer="Liph <liph@gzwinsun.com>" app="gdtelgztelschoolcenternewuser"
 ENV JAR_NAME=newuser \
 ENV JAR_NAME=newuser \
     TZ=Asia/Shanghai
     TZ=Asia/Shanghai
 COPY $JAR_NAME.jar $JAR_NAME.jar
 COPY $JAR_NAME.jar $JAR_NAME.jar

deploy/prod/winsun-docker-application-list/gdtel-gztel-school-center/olduser/Dockerfile

 FROM openjdk:8-jre-alpine
 FROM openjdk:8-jre-alpine
-LABEL maintainer="Liph <liph@gzwinsun.com>" app="olduser"
+LABEL maintainer="Liph <liph@gzwinsun.com>" app="gdtelgztelschoolcenterolduser"
 ENV JAR_NAME=olduser \
 ENV JAR_NAME=olduser \
     TZ=Asia/Shanghai
     TZ=Asia/Shanghai
 COPY $JAR_NAME.jar $JAR_NAME.jar
 COPY $JAR_NAME.jar $JAR_NAME.jar

deploy/prod/winsun-docker-application-list/gdtel-gztel-school-center/renewaluser/Dockerfile

-FROM openjdk:8-jre-alpine
-LABEL maintainer="Liph <liph@gzwinsun.com>" app="renewaluser"
-ENV JAR_NAME=renewaluser \
-    TZ=Asia/Shanghai
-COPY $JAR_NAME.jar $JAR_NAME.jar
-EXPOSE 11095
-CMD java -jar $JAR_NAME.jar --spring.profiles.active=prod
\ No newline at end of file

deploy/prod/winsun-docker-application-list/gdtel-gztel-school-center/task/Dockerfile

 FROM openjdk:8-jre-alpine
 FROM openjdk:8-jre-alpine
-LABEL maintainer="Liph <liph@gzwinsun.com>" app="task"
+LABEL maintainer="Liph <liph@gzwinsun.com>" app="gdtelgztelschoolcentertask"
 ENV JAR_NAME=task \
 ENV JAR_NAME=task \
     TZ=Asia/Shanghai
     TZ=Asia/Shanghai
 COPY $JAR_NAME.jar $JAR_NAME.jar
 COPY $JAR_NAME.jar $JAR_NAME.jar

service-manager/pom.xml

@@ -124,6 +124,13 @@
             <artifactId>common</artifactId>
             <artifactId>common</artifactId>
             <version>${service.version}</version>
             <version>${service.version}</version>
         </dependency>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.alibaba/easyexcel -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>2.1.6</version>
+        </dependency>
     </dependencies>
     </dependencies>
 
 
     <build>
     <build>
@@ -136,6 +143,19 @@
                     <fork>true</fork><!-- 如果没有该项配置，肯呢个devtools不会起作用，即应用不会restart -->
                     <fork>true</fork><!-- 如果没有该项配置，肯呢个devtools不会起作用，即应用不会restart -->
                 </configuration>
                 </configuration>
             </plugin>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                    <!-- 此处为防止乱码对证书不做过滤 -->
+                    <nonFilteredFileExtensions>
+                        <nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>xls</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
+                </configuration>
+            </plugin>
         </plugins>
         </plugins>
         <resources>
         <resources>
             <resource>
             <resource>

service-manager/src/main/java/com/winsun/utils/YrymReportUtils.java

+package com.winsun.utils;
+
+import com.alibaba.excel.EasyExcel;
+import com.winsun.bean.YrymReport;
+
+import java.io.InputStream;
+import java.util.*;
+
+/**
+ * 一人一码发展统计表
+ *
+ * @Author LiuRunYuan
+ * @CreateDate 2020/03/07
+ */
+public class YrymReportUtils {
+
+    public Integer startRow = 0;
+    public Integer endRow = 0;
+
+    /**
+     * 获取统计表模板县分字段
+     *
+     * @return
+     */
+    public LinkedList<String> getSubNameList(InputStream in) {
+        List<Object> list = EasyExcel.read(in).sheet(0).doReadSync();
+        LinkedList<String> subNameList = new LinkedList<>();
+
+        for (int i = 0; i < list.size(); i++) {
+            LinkedHashMap rowList = (LinkedHashMap) list.get(i);
+            if (rowList.size() >= 1) {
+                String rowStr = rowList.get(0).toString();
+                if ("业务类型".equals(rowStr)) {
+                    startRow = i + 3;
+                }
+                if (startRow == 0) {
+                    continue;
+                }
+                if ("合计".equals(rowStr)) {
+                    endRow = i + 3;
+                    break;
+                }
+                subNameList.add(rowStr);
+            }
+        }
+        subNameList.removeFirst();
+        return subNameList;
+    }
+
+    /**
+     * 填入合计值
+     */
+    public static void setAllSum(List<YrymReport> list) {
+        YrymReport sum = new YrymReport();
+        sum.setSubName("合计");
+        for (YrymReport yrymReport : list) {
+            sum.setSchoolNum(sum.getSchoolNum() + yrymReport.getSchoolNum());
+            sum.setStudentNum(sum.getStudentNum() + yrymReport.getStudentNum());
+            sum.setNewUserNumWeek(sum.getNewUserNumWeek() + yrymReport.getNewUserNumWeek());
+            sum.setNewAloneNumWeek(sum.getNewAloneNumWeek() + yrymReport.getNewAloneNumWeek());
+            sum.setNewMixNumWeek(sum.getNewMixNumWeek() + yrymReport.getNewMixNumWeek());
+            sum.setOldUserNumWeek(sum.getOldUserNumWeek() + yrymReport.getOldUserNumWeek());
+            sum.setOldContinueNumWeek(sum.getOldContinueNumWeek() + yrymReport.getOldContinueNumWeek());
+            sum.setFinishNewNumWeek(sum.getFinishNewNumWeek() + yrymReport.getFinishNewNumWeek());
+            sum.setFinishOldNumWeek(sum.getFinishOldNumWeek() + yrymReport.getFinishOldNumWeek());
+            sum.setSumWeek(sum.getSumWeek() + yrymReport.getSumWeek());
+            sum.setNewUserNumMonth(sum.getNewUserNumMonth() + yrymReport.getNewUserNumMonth());
+            sum.setNewAloneNumMonth(sum.getNewAloneNumMonth() + yrymReport.getNewAloneNumMonth());
+            sum.setNewMixNumMonth(sum.getNewMixNumMonth() + yrymReport.getNewMixNumMonth());
+            sum.setOldUserNumMonth(sum.getOldUserNumMonth() + yrymReport.getOldUserNumMonth());
+            sum.setOldContinueNumMonth(sum.getOldContinueNumMonth() + yrymReport.getOldContinueNumMonth());
+            sum.setFinishNewNumMonth(sum.getFinishNewNumMonth() + yrymReport.getFinishNewNumMonth());
+            sum.setFinishOldNumMonth(sum.getFinishOldNumMonth() + yrymReport.getFinishOldNumMonth());
+            sum.setSumMonth(sum.getSumMonth() + yrymReport.getSumMonth());
+            sum.setNewUserNumAll(sum.getNewUserNumAll() + yrymReport.getNewUserNumAll());
+            sum.setNewAloneNumAll(sum.getNewAloneNumAll() + yrymReport.getNewAloneNumAll());
+            sum.setNewMixNumAll(sum.getNewMixNumAll() + yrymReport.getNewMixNumAll());
+            sum.setOldUserNumAll(sum.getOldUserNumAll() + yrymReport.getOldUserNumAll());
+            sum.setOldContinueNumAll(sum.getOldContinueNumAll() + yrymReport.getOldContinueNumAll());
+            sum.setFinishNewNumAll(sum.getFinishNewNumAll() + yrymReport.getFinishNewNumAll());
+            sum.setFinishOldNumAll(sum.getFinishOldNumAll() + yrymReport.getFinishOldNumAll());
+            sum.setSumAll(sum.getSumAll() + yrymReport.getSumAll());
+        }
+        list.add(sum);
+    }
+
+    /**
+     * 填充数据
+     *
+     * @param resultList 填充目标
+     * @param dataList   填充数据
+     * @param flag       1：填充学校数量 2：填充学生数量 3：填充统计数量
+     * @param type       统计数量时间 week：周 month：月 all：全部
+     */
+    public static void joinData(List<YrymReport> resultList, List<Map<String, Object>> dataList, int flag, String type) {
+        for (YrymReport tempYrym : resultList) {
+            Iterator iterator = dataList.iterator();
+            while (iterator.hasNext()) {
+                Map<String, Object> tempMap = (Map<String, Object>) iterator.next();
+                if (tempYrym.getSubName().equals(tempMap.get("subName").toString())) {
+
+                    if (flag == 1) {
+                        tempYrym.setSchoolNum(Integer.valueOf(tempMap.get("schoolNum").toString()));
+                    } else if (flag == 2) {
+                        tempYrym.setStudentNum(Integer.valueOf(tempMap.get("studentNum").toString()));
+                    } else {
+                        tempYrym.setDataBytype(tempMap, type);
+                    }
+
+                    iterator.remove();
+                    break;
+                }
+            }
+        }
+    }
+}