Browse Source

20210513修改跳绳导出表单

recovery
zy_Java 4 years ago
parent
commit
7b718fe865
  1. 4
      beneficiation/src/main/resources/application-test.yml
  2. 3
      mt/src/main/resources/application-prod.yml
  3. 4
      mt/src/main/resources/application.yml
  4. 2
      mt/src/main/resources/druid-dev.yml
  5. 5
      mt/src/main/resources/druid-prod.yml
  6. 105
      mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml
  7. 4
      tall/src/main/resources/application.yml
  8. 6
      tcm/src/main/resources/application-test.yml
  9. 4
      tcm/src/main/resources/application.yml

4
beneficiation/src/main/resources/application-test.yml

@ -9,9 +9,9 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
rabbitmq: rabbitmq:
host: 127.0.0.1 host: 127.0.0.1
password: 111111 password: guest
port: 5672 port: 5672
username: admin username: guest
redis: redis:
database: 0 database: 0
host: 127.0.0.1 host: 127.0.0.1

3
mt/src/main/resources/application-prod.yml

@ -29,7 +29,8 @@ swagger:
enable: true enable: true
eureka: eureka:
instance: instance:
ip-address: 119.3.214.36 ip-address: 127.0.0.1
# ip-address: 119.3.214.36
gatewayUrl: https://www.tall.wiki/gateway/ gatewayUrl: https://www.tall.wiki/gateway/
notGatewayUrl: https://www.tall.wiki/ notGatewayUrl: https://www.tall.wiki/

4
mt/src/main/resources/application.yml

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

2
mt/src/main/resources/druid-dev.yml

@ -29,7 +29,7 @@ spring:
testWhileIdle: true testWhileIdle: true
timeBetweenEvictionRunsMillis: 60000 timeBetweenEvictionRunsMillis: 60000
url: jdbc:mysql://49.233.89.188:3306/mt?useUnicode=true&characterEncoding=UTF-8 url: jdbc:mysql://49.233.89.188:3306/mt?useUnicode=true&characterEncoding=UTF-8
# url: jdbc:mysql://127.0.0.1/mt?useUnicode=true&characterEncoding=UTF-8 # url: jdbc:mysql://www.tall.wiki/mt?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
username: root username: root
validationQuery: SELECT 1 FROM DUAL validationQuery: SELECT 1 FROM DUAL
# env: CCSENS_GAME # env: CCSENS_GAME

5
mt/src/main/resources/druid-prod.yml

@ -15,7 +15,8 @@ spring:
maxWait: 60000 maxWait: 60000
minEvictableIdleTimeMillis: 300000 minEvictableIdleTimeMillis: 300000
minIdle: 5 minIdle: 5
password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473 password:
# password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
poolPreparedStatements: true poolPreparedStatements: true
servletLogSlowSql: true servletLogSlowSql: true
servletLoginPassword: 111111 servletLoginPassword: 111111
@ -27,7 +28,7 @@ spring:
testOnReturn: false testOnReturn: false
testWhileIdle: true testWhileIdle: true
timeBetweenEvictionRunsMillis: 60000 timeBetweenEvictionRunsMillis: 60000
url: jdbc:mysql://www.tall.wiki/mt?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true url: jdbc:mysql://127.0.0.1/mt?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
username: root username: root
validationQuery: SELECT 1 FROM DUAL validationQuery: SELECT 1 FROM DUAL
env: CCSENS_TALL env: CCSENS_TALL

105
mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml

@ -401,41 +401,76 @@
<select id="selectCompeteJoinCountList" resultType="com.ccsens.mt.bean.vo.TableVo$CompeteOverview"> <select id="selectCompeteJoinCountList" resultType="com.ccsens.mt.bean.vo.TableVo$CompeteOverview">
select t3.companyId,t3.companyName as companyName , t1.coachNum, t2.guideNum, t3.playerNum , IFNULL(t1.coachNum,0) + IFNULL(t2.guideNum,0) + IFNULL(t3.playerNum,0) as sum from select t3.companyId,t3.companyName as companyName , t1.coachNum, t2.guideNum, t3.playerNum , IFNULL(t1.coachNum,0) + IFNULL(t2.guideNum,0) + IFNULL(t3.playerNum,0) as sum
(select t.companyId, t.companyName,count(t.id) as playerNum from
(SELECT
DISTINCT(tcp.id) as id, tcc.id as companyId,tcc.`name` as companyName
FROM FROM
t_compete_company tcc (
left join SELECT
t_compete_player tcp on tcc.id = tcp.company_id t.companyId,
LEFT JOIN t_compete_project_player tcpp ON tcp.id = tcpp.player_id t.companyName,
WHERE count( t.id ) AS playerNum
tcc.type = 0 FROM
AND tcp.company_id = tcc.id (
AND tcc.rec_status = 0 SELECT DISTINCT
AND tcp.rec_status = 0 ( tcp.id ) AS id,
AND tcpp.rec_status = 0 tcc.id AS companyId,
UNION tcc.`name` AS companyName
SELECT FROM
DISTINCT(tcp.id) as id,tcc.id as companyId,tcc.`name` as companyName t_compete_company tcc
FROM LEFT JOIN t_compete_player tcp ON tcc.id = tcp.company_id AND tcp.rec_status = 0
t_compete_company tcc LEFT JOIN t_compete_project_player tcpp ON tcp.id = tcpp.player_id AND tcpp.rec_status = 0
LEFT JOIN t_compete_team tct ON tcc.id = tct.company_id WHERE
LEFT JOIN t_compete_team_member tctm on tct.id = tctm.compete_team_id tcc.type = #{competeTimeId}
LEFT JOIN t_compete_player tcp ON tctm.player_id = tcp.id AND tcc.rec_status = 0
WHERE UNION
tcc.type = 0 SELECT DISTINCT
AND tct.rec_status = 0 ( tcp.id ) AS id,
AND tctm.rec_status = 0 tcc.id AS companyId,
And tcc.rec_status = 0 tcc.`name` AS companyName
AND tcp.rec_status = 0) t FROM
group by t.companyId t_compete_company tcc
having count(t.id) > 0 LEFT JOIN t_compete_team tct ON tcc.id = tct.company_id AND tct.rec_status = 0
) t3 LEFT JOIN t_compete_team_member tctm ON tct.id = tctm.compete_team_id AND tctm.rec_status = 0
left join LEFT JOIN t_compete_player tcp ON tctm.player_id = tcp.id AND tcp.rec_status = 0
(SELECT tcc.id as companyId,tcc.`name` as companyName ,count(tcca.id) as coachNum FROM t_compete_company tcc left join (select * from t_compete_coach where rec_status = 0) tcca on tcc.id = tcca.company_id where tcc.type = 0 AND identity = 1 and tcc.rec_status = 0 GROUP BY tcc.id) t1 on t1.companyId = t3.companyId WHERE
left join tcc.type = #{competeTimeId}
(SELECT tcc.id as companyId,tcc.`name` as companyName , count(tcca.id) as guideNum FROM t_compete_company tcc left join (select * from t_compete_coach where rec_status = 0) tcca on tcc.id = tcca.company_id where tcc.type = 0 AND identity = 0 and tcc.rec_status = 0 GROUP BY tcc.id) t2 on t2.companyId = t3.companyId AND tct.rec_status = 0
) t
GROUP BY
t.companyId
HAVING
count( t.id ) > 0
) t3
LEFT JOIN (
SELECT
tcc.id AS companyId,
tcc.`name` AS companyName,
count( tcca.id ) AS coachNum
FROM
t_compete_company tcc
LEFT JOIN ( SELECT * FROM t_compete_coach WHERE rec_status = 0 ) tcca ON tcc.id = tcca.company_id
AND tcca.rec_status = 0
WHERE
tcc.type = #{competeTimeId}
AND identity = 1
AND tcc.rec_status = 0
GROUP BY
tcc.id
) t1 ON t1.companyId = t3.companyId
LEFT JOIN (
SELECT
tcc.id AS companyId,
tcc.`name` AS companyName,
count( tcca.id ) AS guideNum
FROM
t_compete_company tcc
LEFT JOIN ( SELECT * FROM t_compete_coach WHERE rec_status = 0 ) tcca ON tcc.id = tcca.company_id
AND tcca.rec_status = 0
WHERE
tcc.type = #{competeTimeId}
AND identity = 0
AND tcc.rec_status = 0
GROUP BY
tcc.id
) t2 ON t2.companyId = t3.companyId
</select> </select>
</mapper> </mapper>

4
tall/src/main/resources/application.yml

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

6
tcm/src/main/resources/application-test.yml

@ -9,9 +9,9 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
rabbitmq: rabbitmq:
host: 127.0.0.1 host: 127.0.0.1
password: 111111 password: guest
port: 5672 port: 5672
username: admin username: guest
redis: redis:
database: 0 database: 0
host: 127.0.0.1 host: 127.0.0.1
@ -28,7 +28,7 @@ swagger:
enable: true enable: true
eureka: eureka:
instance: instance:
ip-address: 192.168.0.99 ip-address: 127.0.0.1
file: file:
path: /home/cloud/tcm/uploads/ path: /home/cloud/tcm/uploads/
domain: https://www.sxwikionline.com/gateway/tcm/ domain: https://www.sxwikionline.com/gateway/tcm/

4
tcm/src/main/resources/application.yml

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

Loading…
Cancel
Save