From 185b265f07656495bfbc169301a5e92246253be4 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 25 Nov 2020 19:19:39 +0800 Subject: [PATCH 1/3] 20201125v1.7 --- mt/src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 1588c6bad30fbec1651de0ddc70f7c255d7aa777 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Wed, 25 Nov 2020 19:40:06 +0800 Subject: [PATCH 2/3] 1 --- mt/src/main/resources/mapper_dao/CompeteProjectDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From b1e227a49fdf29a0079ad5af1a6edc144d7340fd Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 25 Nov 2020 20:19:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?20201125v1.8=E4=BF=AE=E6=94=B9=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mt/src/main/resources/mapper_dao/CompeteScoreDao.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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