From 934ae56fe1ca8bf619f11920c4d03a22b319bf46 Mon Sep 17 00:00:00 2001
From: "Lihong@123456" <1090591095@qq.com>
Date: Mon, 16 Nov 2020 14:13:55 +0800
Subject: [PATCH] 11-16-2

---
 .../com/ccsens/mt/api/CompeteScoreController.java    |  2 +-
 .../main/java/com/ccsens/mt/bean/dto/VideoDto.java   |  2 --
 .../java/com/ccsens/mt/service/CompeteService.java   |  3 ++-
 .../resources/mapper_dao/CompeteProjectConfigDao.xml |  2 +-
 mt/src/main/resources/mapper_dao/CompeteScoreDao.xml | 12 ++++++------
 tall/src/main/resources/application-dev.yml          |  2 +-
 tall/src/main/resources/application.yml              |  4 ++--
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java
index 983dd98f..c1bc93e4 100644
--- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java
+++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java
@@ -40,7 +40,7 @@ public class CompeteScoreController {
         return JsonResponse.newInstance().ok(playerList);
     }
 
-    @MustLogin
+//    @MustLogin
     @ApiOperation(value = "项目状态", notes = "lihong，查询项目集合，再根据时间判断项目得状态")
     @RequestMapping(value = "/countScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<CompeteVo.CountScore> countScore(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> params) {
diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java
index 21bb3fd9..2105d806 100644
--- a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java
+++ b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java
@@ -81,10 +81,8 @@ public class VideoDto {
         private Long id;
         @ApiModelProperty("姓名/参赛队伍")
         private String name;
-
         @ApiModelProperty("账号")
         private String phone;
-
         @ApiModelProperty("签到时间")
         private Long signEndTime;
 
diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
index 5f14e370..0ed4dbaa 100644
--- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
@@ -1123,7 +1123,8 @@ public class CompeteService implements ICompeteService {
         competeCountScore.setDeductCause(params.getDeductReason());
         competeCountScore.setFinalScore(params.getFinalScore());
         competeCountScore.setId(snowflake.nextId());
-                competeCountScoreMapper.insert(competeCountScore);
+        competeCountScore.setRecStatus((byte) 0);
+        competeCountScoreMapper.insert(competeCountScore);
     }
 
 
diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
index 5edd2613..64c4c54a 100644
--- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
@@ -65,7 +65,7 @@
       and tcc.id = #{companyId}
     </if>
     <if test="name != null and name != ''">
-      and tcp.name = #{name}
+      and tcp.name like #{name}
     </if>
     <if test="idCard != null and idCard != ''">
       and tcp.id_card = #{idCard}
diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
index 1a789b7b..43ea9e8f 100644
--- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
@@ -18,7 +18,7 @@
     and tcc.rec_status = 0
     and tcpp.project_id= #{projectId}
     and tcpp.compete_group_id =#{competeGroupId}
-    GROUP BY tccs.final_score
+    GROUP BY tccs.final_score DESC
   </select>
 
   <select id="selectGroupCount" resultType="com.ccsens.mt.bean.vo.ScoreVo$CompeteScore" parameterType="java.util.Map">
@@ -32,9 +32,9 @@
     WHERE tct.rec_status = 0
     and tcso.rec_status=0
     and tccs.rec_status =0
-    and and tct.project_id= #{projectId}
+    and tct.project_id= #{projectId}
     and tct.compete_group_id =  #{competeGroupId}
-    GROUP BY tccs.final_score;
+    GROUP BY tccs.final_score DESC
   </select>
 
   <select id="selectSingleVarity" resultType="com.ccsens.mt.bean.vo.ScoreVo$CompeteScore" parameterType="java.util.Map">
@@ -54,7 +54,7 @@
     and tcc.rec_status = 0
     and tcpp.project_id= #{projectId}
     and tcpp.compete_group_id = #{competeGroupId}
-    GROUP BY tcvs.score
+    GROUP BY tcvs.score DESC
   </select>
 
   <select id="selectGroupVarity" resultType="com.ccsens.mt.bean.vo.ScoreVo$CompeteScore" parameterType="java.util.Map">
@@ -68,9 +68,9 @@
     WHERE tct.rec_status = 0
     and tcso.rec_status=0
     and tcvs.rec_status =0
-    and and tct.project_id= #{projectId}
+    and tct.project_id= #{projectId}
     and tct.compete_group_id =  #{competeGroupId}
-    GROUP BY tcvs.score
+    GROUP BY tcvs.score DESC
   </select>
 
 
diff --git a/tall/src/main/resources/application-dev.yml b/tall/src/main/resources/application-dev.yml
index ee29058b..ee0a41b5 100644
--- a/tall/src/main/resources/application-dev.yml
+++ b/tall/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
 server:
-  port: 7070
+  port: 7030
   servlet:
     context-path: /v1.0
 spring:
diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index ebc544af..b5408a3a 100644
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
-    include: util-test,common
+    active: dev
+    include: util-dev,common