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

mt/src/main/resources/application.yml

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

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

@@ -15,7 +15,7 @@
     tcg.group_name as competeGroup,
     tcc.`name` as joinTeam,
     tcp.`name` as  name,
-    tcp.gender as gender,
+    if(tcp.gender = 1,'男','女') as gender,
     tcp.id_card as idCard,
     (2020 - SUBSTR(tcp.id_card FROM 7 FOR 4)) as age
     from t_compete_project tcpro

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

@@ -743,8 +743,8 @@
     IF
         (
         (
-        ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player ) )
+        ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player WHERE rec_status = 0) )
-        OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member ) )
+        OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member WHERE rec_status = 0) )
         ),
         1,
         0
@@ -839,8 +839,8 @@
         IF
             (
             (
-            ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player ) )
+            ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player WHERE rec_status = 0) )
-            OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member ) )
+            OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member WHERE rec_status = 0) )
             ),
             1,
             0