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

mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java

@@ -381,9 +381,9 @@ public class CompeteDto {
         @ApiModelProperty("项目id")
         private Long projectId;
         @ApiModelProperty("当前页")
-        private int page=1;
+        private int pageNum =1;
         @ApiModelProperty("每页数量")
-        private  int size=10;
+        private  int pageSize =10;
     }
 
     @Data

mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java

@@ -48,6 +48,8 @@ public class TableVo {
         private String bodyProtect;
         @ApiModelProperty("参赛队伍")
         private String joinTeam;
+        @ApiModelProperty("加入规则")
+        private Byte joinRule;
 
         public int getAge(){
             if(StrUtil.isNotEmpty(idCard) && age == 0){

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

@@ -15,7 +15,6 @@ import com.ccsens.mt.bean.dto.ScoreDto;
 import com.ccsens.mt.bean.po.*;
 import com.ccsens.mt.bean.vo.CompeteVo;
 import com.ccsens.mt.bean.vo.ScoreVo;
-import com.ccsens.mt.bean.vo.TableVo;
 import com.ccsens.mt.persist.dao.*;
 import com.ccsens.mt.persist.mapper.*;
 import com.ccsens.mt.util.Constant;
@@ -47,7 +46,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * @author 逗
@@ -1486,7 +1484,7 @@ public class CompeteService implements ICompeteService {
         long projectId = params.getProjectId();
         long competeTimeId = params.getCompeteTimeId();
         Byte type = 0;
-        PageHelper.startPage(params.getPage(),params.getSize());
+        PageHelper.startPage(params.getPageNum(),params.getPageSize());
         List<CompeteVo.SpeedPass> speedPassList = competeScoreDao.selectByProjectIdAndPid(projectId, competeTimeId);
         PageInfo pageInfo = new PageInfo<>(speedPassList);
         if (CollectionUtil.isNotEmpty(speedPassList)) {
@@ -1599,7 +1597,7 @@ public class CompeteService implements ICompeteService {
         long projectId = params.getProjectId();
         long competeTimeId = params.getCompeteTimeId();
         Byte type = 0;
-        PageHelper.startPage(params.getPage(),params.getSize());
+        PageHelper.startPage(params.getPageNum(),params.getPageSize());
         List<CompeteVo.SpeedPass> speedPassList = competeScoreDao.selectByProjectIdAndPid(projectId, competeTimeId);
         PageInfo pageInfo = new PageInfo<>(speedPassList);
         if (CollectionUtil.isNotEmpty(speedPassList)) {

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

@@ -271,11 +271,17 @@ public class ExcelService implements IExcelService {
         //个人项目名报名
         List<TableVo.CompeteJoin> playerForSingleList = competeProjectDao.getPlayerForSingle(level, type);
         playerForSingleList.forEach(mes->{
+            if (mes.getJoinRule()==1){
+                mes.setCompeteGroup("不限组别");
+            }
             competeJoinList.add(mes);
         });
         //团队项目报名
         List<TableVo.CompeteJoin> playerForTeamList = competeProjectDao.getPlayerForTeam(level, type);
         playerForTeamList.forEach(mes->{
+            if (mes.getJoinRule()==1){
+                mes.setCompeteGroup("不限组别");
+            }
             competeJoinList.add(mes);
         });
         return competeJoinList;
@@ -648,6 +654,7 @@ public class ExcelService implements IExcelService {
                                 three3 = new PoiUtil.PoiUtilCell("不限组别", 1, j);
                             }
                             q++;
+
                         } else {
                             three1 = new PoiUtil.PoiUtilCell();
                             three2 = new PoiUtil.PoiUtilCell();
@@ -1078,6 +1085,11 @@ public class ExcelService implements IExcelService {
 //          }
         PageHelper.startPage(params.getPage(),params.getSize());
         List<TableVo.CompeteJoin> competeJoinList = competeProjectConfigDao.selectPeople(params.getProjectId(), params.getGroupId(), params.getCompanyId(), params.getName(), params.getIdCard());
+        competeJoinList.forEach(mes->{
+            if (mes.getJoinRule()==1){
+                mes.setCompeteGroup("不限组别");
+            }
+        });
         PageInfo pageInfo = new PageInfo<>(competeJoinList);
         return  pageInfo;
     }
@@ -1167,6 +1179,7 @@ public class ExcelService implements IExcelService {
             cells.add(poiUtilCel3);
             StringBuilder stringBuilder = new StringBuilder();
             if (CollectionUtil.isNotEmpty(schedulePlan.getSchedulePlanDetailListMorning())) {
+                int a = 1;
                 for (TableVo.SchedulePlanDetail schedulePlanDetail : schedulePlan.getSchedulePlanDetailListMorning()) {
                     Date date = new Date(schedulePlanDetail.getStartTime());
                     SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm");
@@ -1175,7 +1188,8 @@ public class ExcelService implements IExcelService {
                     SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm");
                     String year1 = simpleDateFormat1.format(date1);
                     String string = schedulePlanDetail.getProjectName()  + "(" + year +"-"+  year1 + ")";
-                    stringBuilder.append(string+"  \n");
+                    stringBuilder.append(a+"、"+string+"  \n");
+                    a++;
 
                 }
             }
@@ -1183,6 +1197,7 @@ public class ExcelService implements IExcelService {
             cells.add(poiUtilCel);
             StringBuilder stringBuilder1 = new StringBuilder();
             if (CollectionUtil.isNotEmpty(schedulePlan.getSchedulePlanDetailListAfternoon())) {
+                int a =1;
                 for (TableVo.SchedulePlanDetail schedulePlanDetail : schedulePlan.getSchedulePlanDetailListAfternoon()) {
                     Date date = new Date(schedulePlanDetail.getStartTime());
                     SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm");
@@ -1191,13 +1206,15 @@ public class ExcelService implements IExcelService {
                     SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm");
                     String year1 = simpleDateFormat1.format(date1);
                     String string = schedulePlanDetail.getProjectName()  + "(" + year +"-"+  year1 + ")";
-                    stringBuilder1.append(string+"  "+"\n");
+                    stringBuilder1.append(a+"、"+string+"  \n");
+                    a++;
                 }
             }
             PoiUtil.PoiUtilCell poiUtilCell = new PoiUtil.PoiUtilCell(stringBuilder1.toString());
             cells.add(poiUtilCell);
             StringBuilder stringBuilder2 = new StringBuilder();
             if (CollectionUtil.isNotEmpty(schedulePlan.getSchedulePlanDetailListNight())){
+                int a=1;
             for (TableVo.SchedulePlanDetail schedulePlanDetail: schedulePlan.getSchedulePlanDetailListNight()){
                 Date date = new Date(schedulePlanDetail.getStartTime());
                 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm");
@@ -1206,7 +1223,8 @@ public class ExcelService implements IExcelService {
                 SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm");
                 String year1 = simpleDateFormat1.format(date1);
                 String string = schedulePlanDetail.getProjectName()  + "(" + year +"-"+  year1 + ")";
-                stringBuilder2.append(string+"  "+"\n");
+                stringBuilder2.append(a+"、"+string+"  \n");
+                a++;
                 }
             }
             PoiUtil.PoiUtilCell poiUtilCel2 = new PoiUtil.PoiUtilCell(stringBuilder2.toString());

mt/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: prod
+    active: dev
-    include: common, util-prod
+    include: common, util-dev
 
 

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

@@ -93,6 +93,7 @@
         tcp.`name` as name,
         tcp.gender as gender,
         tcp.id_card as idCard,
+        tcpro.join_rule as joinRule,
         (SELECT visit_location from t_common_file where tcp.id_card_front_file = id ) as idCardPromiseFront,
         (SELECT visit_location from t_common_file where tcp.id_card_back_file = id ) as idCardPromiseBack,
         (SELECT visit_location from t_common_file where tcp.id_photo_file = id ) as picture,
@@ -141,6 +142,7 @@
         tcp.`name` as name,
         tcp.gender as gender,
         tcp.id_card as idCard,
+        tcpro.join_rule  as joinRule,
         (SELECT visit_location from t_common_file where tcp.id_card_front_file = id ) as idCardPromiseFront,
         (SELECT visit_location from t_common_file where tcp.id_card_back_file = id ) as idCardPromiseBack,
         (SELECT visit_location from t_common_file where tcp.id_photo_file = id ) as picture,

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

@@ -17,7 +17,8 @@
     tcp.`name` as  name,
     if(tcp.gender = 1,'男','女') as gender,
     tcp.id_card as idCard,
-    (2020 - SUBSTR(tcp.id_card FROM 7 FOR 4)) as age
+    (2020 - SUBSTR(tcp.id_card FROM 7 FOR 4)) as age,
+    tcpro.join_rule as joinRule
     from t_compete_project tcpro
     LEFT JOIN t_compete_project_player tcpp on tcpro.id = tcpp.project_id
     LEFT JOIN t_compete_player tcp on tcp.id = tcpp.player_id
@@ -42,7 +43,8 @@
     pl.`name` as name ,
     pl.id_card as idCard,
     if(pl.gender = 1,'男','女') as gender,
-    (2020 - SUBSTR(pl.id_card FROM 7 FOR 4)) as age
+    (2020 - SUBSTR(pl.id_card FROM 7 FOR 4)) as age,
+    p.join_rule as joinRule
     FROM
     t_compete_project p
     LEFT JOIN t_compete_team t on p.id = t.project_id