diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 4ecd13fd..b9b264a7 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: common, util-dev + active: prod + include: common, util-prod diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml index 94ae1108..abe842ad 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml +++ b/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 diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index 0355187d..85d0c322 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/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 ) ) - OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member ) ) + ( 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 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 ) ) - OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member ) ) + ( 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 WHERE rec_status = 0) ) ), 1, 0