Commit 9b5b582b by chenjinjing

no message

parent fe4e7fa7
...@@ -46,7 +46,7 @@ export async function getData(req, res) { ...@@ -46,7 +46,7 @@ export async function getData(req, res) {
let 最新一条数据 = await get最近一条淘汰赛时间(); let 最新一条数据 = await get最近一条淘汰赛时间();
let data = await get积分赛淘汰赛数据(最新一条数据.time || new Date(), 0 ); let data = await get积分赛淘汰赛数据(最新一条数据.time || new Date(), 0 );
let dataName = 最新一条数据.type == 1 ? "淘汰赛" : "校内积分赛"; let dataName = 最新一条数据.type == 1 ? "淘汰赛" : "校内积分赛";
ret["matchlist"] = getListData(dataName, data, ["排名","学员","场次","胜场","负场","积分"], {"排名":"rank","学员":"p_name","场次":"gameCount","胜场":"win","负场":"lose","积分":"points"} ); ret["matchlist"] = getListData(dataName, data, ["排名","照片","学员","场次","胜场","负场","积分"], {"排名":"rank","照片":"self_pic","学员":"p_name","场次":"gameCount","胜场":"win","负场":"lose","积分":"points"} );
ret["api12"] = await 基础数据(); ret["api12"] = await 基础数据();
......
...@@ -105,9 +105,10 @@ export async function get积分赛淘汰赛数据(time, type) { ...@@ -105,9 +105,10 @@ export async function get积分赛淘汰赛数据(time, type) {
let list = []; let list = [];
selectResult.forEach(info => { selectResult.forEach(info => {
let {RANK, P_NAME, GAME_COUNT, WIN, LOSE, POINTS} = info; let {RANK, SELF_PIC, P_NAME, GAME_COUNT, WIN, LOSE, POINTS} = info;
list.push({ list.push({
rank:RANK, rank:RANK,
self_pic:SELF_PIC,
p_name:P_NAME, p_name:P_NAME,
gameCount:GAME_COUNT, gameCount:GAME_COUNT,
win:WIN, win:WIN,
...@@ -152,10 +153,10 @@ export async function 学员库() { ...@@ -152,10 +153,10 @@ export async function 学员库() {
export async function 基础数据() { export async function 基础数据() {
let sql = `select * from(select m.m_id,m.self_name,birth,habitual_hand,match_count,win_count,win_rate,self_score,opponent_score,opponent_name,p_id,self_pic,row_number() let sql = `select * from(select m.m_id,m.self_name,birth,habitual_hand,match_count,win_count,win_rate,self_score,opponent_score,opponent_name,p_id,s.self_pic,row_number()
over(partition by m.self_name order by m.self_name asc) rn over(partition by m.self_name order by m.self_name asc) rn
from student s,recent_match m from student s,recent_match m
where s.p_id=m.self_pid group by m.m_id,m.self_name,birth,habitual_hand,match_count,win_count,win_rate,self_score,opponent_score,opponent_name,p_id,self_pic where s.p_id=m.self_pid group by m.m_id,m.self_name,birth,habitual_hand,match_count,win_count,win_rate,self_score,opponent_score,opponent_name,p_id,s.self_pic
)t where rn <=5`; )t where rn <=5`;
let selectList = await selectData(sql); let selectList = await selectData(sql);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment