Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

mt/src/main/java/com/ccsens/mt/service/ExcelService.java

@@ -625,16 +625,7 @@ public class ExcelService implements IExcelService {
 
     private List<TableVo.CompeteOverview> competeJoinCountList(CompeteDto.CompeteTime params) {
         List<TableVo.CompeteOverview>  competeOverviewList = competeCompanyDao.selectCompeteJoinCountList(params.getCompeteTimeId());
-        List<TableVo.CompeteOverview>  list = new LinkedList<>();
-        competeOverviewList.forEach(mes->{
-            if (mes.getGuideNum()!=0 && mes.getCoachNum()!=0 && mes.getPlayerNum()!=0){
-                int num = mes.getCoachNum()+mes.getPlayerNum()+mes.getGuideNum();
-                mes.setSum(num);
-                list.add(mes);
-            }
-
-        });
-        return  list;
+        return  competeOverviewList;
     }
 
 

mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml

@@ -401,7 +401,9 @@
 
 
     <select id="selectCompeteJoinCountList" resultType="com.ccsens.mt.bean.vo.TableVo$CompeteOverview">
-        SELECT * FROM
+        SELECT *,
+        (coachNum+guideNum+playerNum) as sum
+        FROM
         (SELECT
         tcc.`name` as companyName,
         tcc.id,