20201127v1.7

mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java

@@ -84,7 +84,7 @@ public class CompeteScoreController {
     }
 
 
-    @ApiOperation(value = "项目状态", notes = "")
+    @ApiOperation(value = "项目状态（手机用）", notes = "")
     @RequestMapping(value = "/countScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<CompeteVo.CountScore> countScore(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> params) {
         log.info("查询比赛项目上的参赛选手列表：{}",params);
@@ -93,7 +93,7 @@ public class CompeteScoreController {
     }
 
 
-    @ApiOperation(value = "选手排名", notes = "多个信息表关联之后，利用分数排序")
+    @ApiOperation(value = "选手排名（手机用）", notes = "多个信息表关联之后，利用分数排序")
     @RequestMapping(value = "/countScoreDetail", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<ScoreVo.CompeteScore> countScoreDetail(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.ProjectIdAndGroupId> params) {
         log.info("查询比赛项目上的参赛选手列表：{}",params);

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

@@ -27,7 +27,7 @@ public class CompeteExcelVo {
     public static class TeamOrderPlayerList {
         @ApiModelProperty("团队id")
         private Long teamId;
-        @ApiModelProperty("场次")
+        @ApiModelProperty("场次加场地")
         private String startOrder;
         @ApiModelProperty("单位名称")
         private String companyName;
@@ -35,6 +35,10 @@ public class CompeteExcelVo {
         private String playerName;
         @ApiModelProperty("视频路径")
         private String videoUrl;
+        @ApiModelProperty("场次")
+        private String competeOrder;
+        @ApiModelProperty("场地")
+        private String site;
     }
 
     @Data

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

@@ -630,6 +630,10 @@ public class ExcelService implements IExcelService {
             two6.setValue("参赛人员");
             PoiUtil.PoiUtilCell two7=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
             two7.setValue("比赛视频路径");
+            PoiUtil.PoiUtilCell two8=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+            two7.setValue("场次");
+            PoiUtil.PoiUtilCell two9=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+            two7.setValue("场地");
             two.add(two1);
             two.add(two2);
             two.add(two3);
@@ -637,6 +641,8 @@ public class ExcelService implements IExcelService {
             two.add(two5);
             two.add(two6);
             two.add(two7);
+            two.add(two8);
+            two.add(two9);
             biao.add(two);
             for (CompeteExcelVo.Project project : allProjectList) {
                 int j = 0, q = 0;//一个项目得长度   项目循环
@@ -679,6 +685,8 @@ public class ExcelService implements IExcelService {
                         PoiUtil.PoiUtilCell three5 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getCompanyNameList().get(m).getCompanyName(), 1, 1);
                         PoiUtil.PoiUtilCell three6 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getCompanyNameList().get(m).getPlayerName(), 1, 1);
                         PoiUtil.PoiUtilCell three7 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getCompanyNameList().get(m).getVideoUrl(), 1, 1);
+                        PoiUtil.PoiUtilCell three8 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getCompanyNameList().get(m).getCompeteOrder(), 1, 1);
+                        PoiUtil.PoiUtilCell three9 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getCompanyNameList().get(m).getSite(), 1, 1);
                         three.add(three1);
                         three.add(three2);
                         three.add(three3);
@@ -686,6 +694,8 @@ public class ExcelService implements IExcelService {
                         three.add(three5);
                         three.add(three6);
                         three.add(three7);
+                        three.add(three8);
+                        three.add(three9);
                         biao.add(three);
                     }
                 }

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/CompeteScoreDao.xml

@@ -903,6 +903,8 @@
                 <result column="playerName" property="playerName"/>
                 <result property="teamId" column="teamId"/>
                 <result property="videoUrl" column="videoUrl"/>
+                <result property="competeOrder" column="competeOrder"/>
+                <result property="site" column="site"/>
             </collection>
         </collection>
     </resultMap>