Merge branch 'master' of http://123.207.147.179:8888/node_server/sportsschoolserver

src/biz/ydygl.ts

@@ -60,6 +60,6 @@ export async function getCompetition(req, res) {
     let data = await get积分赛淘汰赛数据(time, type);
     let ret:any = {};
     let dataName = type == 1 ? "淘汰赛" : "校内积分赛";
-    ret["api1"] = getListData(dataName, data, ["排名","球员","场次","胜场","负场","积分"], {"排名":"rank","学员":"trainee","场次":"session","胜场":"win","负场":"lose","积分":"points"} );
+    ret["api11"] = getListData(dataName, data, ["排名","球员","场次","胜场","负场","积分"], {"排名":"rank","学员":"trainee","场次":"session","胜场":"win","负场":"lose","积分":"points"} );
     res.send(ret);
 }

src/data/ydyglData.ts

+import { Query } from "mongoose";
 import { selectData, selectOnceObjectData } from "./orcaleInterface";
+import pyfl from 'pyfl';
 
 const percentStr = '&%';
 const sqlKeyValueConfig = {
@@ -39,7 +41,7 @@ const sqlKeyValueConfig = {
         sql:"select * from player_sex_ratio", 
         analysis:{ "男":"male", "女":"female" },
         haveUnit:"&%"
-    },
+    }
     
 
 };
@@ -98,32 +100,85 @@ function checkUnit(str, data, allUnit?) {
 export async function get积分赛淘汰赛数据(time, type) {
     //这里要单独做，切换时间的时候有个接口，直接调用这个就可以  根据时间和类型来拼sql
     //他们数据表少了时间字段，少了比赛类型字段(淘汰赛，积分赛)
-    let sql = '';
+    let sql = 'select * from points_competition';
     let selectResult = await selectData(sql);
     return selectResult;
 }
 
 //todo 少了一张表
 async function 男女训练成绩对比() {
-
+    let sql = "select * from train_month_sex";
+    let info = await selectData(sql);
+    let result = {
+        "月份":info.month_sex,
+        "女":info.female,
+        "男":info.male
+    }
+    return result;
 }
 //todo 同上
 async function 月训练量趋势() {
-
+    let sql = "select * from train_month_sex";
+    let info = await selectData(sql);
+    let result = {
+        "月份":info.month_sex,
+        "女":info.female,
+        "男":info.male
+    }
+    return result;
 }
 //  比赛类型 他们给的文档字段有问题 需要核对
 
-export async function 基本信息() {
-    //需要确认 student 表的pid和 recent_match表的 self_pid 有没有关联  此处默认有关联
-    //需要确认 a对战b 数据库会出现一条数据还是两条数据  此出默认两条数据
-    //需要确认  recent_match表中的状态字段是多余的
-    //需要确认  recent_match 表中的 日期单词拼错了
+export async function 学员库() {
+    let sql = "select p_name from student";
+    let info = await selectOnceObjectData(sql);
+    let result = {
+        "运动员姓名":info.p_name
+    };
+    let resultData = pyfl(result);
+    console.log(result);
+    console.log(resultData);
+    return resultData;
+}
 
-    let sql = "select * from ";
-    
+export async function 基础数据() {
+    //需要确认 student 表的pid和 recent_match表的 self_pid 有没有关联  此处默认有关联     没有关联
+    //需要确认 a对战b 数据库会出现一条数据还是两条数据  此出默认两条数据     根据a显示数据   a有几场数据出现几条数据
+    //需要确认  recent_match表中的状态字段是多余的      
+    //需要确认  recent_match 表中的 日期单词拼错了    改成了m_date
+
+    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,row_number()
+        over(partition by m.self_name order by m.self_name asc) rn
+        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
+        )t where rn <=5`;
     //todo 这里的sql需要优化
+    let info = await selectOnceObjectData(sql);
+    
+    let result = {
+        "基本信息": {
+            "出生日期": info.birth,
+            "惯用手": info.habitual_hand,
+            "比赛场次": info.match_count,
+            "胜场": info.win_count,
+            "胜率": info.win_rate
+        },
+        "近期比赛": {
+            "match":[
+                info.self_name,info.self_score,info.opponent_score,info.opponent_name
+            ]
+        }
+    }
+    let resultData = "";
+    for (let i in result) {
+        resultData = result[i];
+    }
+    resultData = resultData.sort(
+        function compareFunction(item1, item2) {
 
-    let result = [];
-    return result;
+            return item1.localeCompare(item2);
+        }
+    )
 
+    return resultData;
 }
\ No newline at end of file