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

src/data/xsxxfxData.ts

@@ -6,7 +6,7 @@ export async function getBaseData(id) {
 
     let sql = 'select * from students_detail where p_id=Placeholder1';
     let baseObj = { "img":"SELF_PIC","姓名":"P_NAME", "性别" :"SEX", "英语名字":"EN_NAME", "主教练" :"COACH", "出生年份" :"BIRTH&年", "身高" :"HEIGHT&米", "体重" :"WEIGHT&公斤", "比赛场次" :"MATCH_COUNT", "胜场" :"WIN_COUNT", "胜率" :"WIN_RATE&%", "排名" :"RANK", "惯用手" :"HABITUAL_HAND" };
-    let scoreObj = { "击球速度":"HIT_SPEED", "击球力量":"HIT_POWER", "正手能力":"FOREHAND", "反手能力":"BACKHAND", "得分率":"SCORE_RATE&%"};
+    let scoreObj = { "击球速度":"HIT_SPEED", "击球力量":"HIT_POWER", "正手能力":"FOREHAND", "反手能力":"BACKHAND", "得分率":"SCORE_RATE"};
 
     let selectResult = await selectOnceObjectData(sql, id);
 
@@ -63,7 +63,7 @@ function checkUnit(checkString, data, allUnit?) {
 
 
 export async function get近期比赛概览(PID, checkDate) {
-    let sql = "select * from recent_match where self_pid = Placeholder1 and m_date < Placeholder2";
+    let sql = "select * from recent_match where self_pid = Placeholder1 and m_date <= Placeholder2";
     let selectResult = await selectData(sql, PID, checkDate);
     let result = [];
     let firstDate = "";
@@ -89,7 +89,7 @@ export async function get近期比赛概览(PID, checkDate) {
 }
 
 export async function get全部比赛日期() {
-    let sql = "select to_char(m_date,'yyyy/mm/dd') m_time from recent_match group by m_date";
+    let sql = "select to_char(m_date,'yyyy-mm-dd') m_time from recent_match group by m_date";
     let selectResult = await selectData(sql); // [{to_char:'日期'},...]
     let result = [];
     selectResult.forEach(info => {
@@ -116,17 +116,19 @@ function dataFormatInSubKey(time) {
     let date = new Date(time);
     let match = date.getMonth() + 1;
     let matchStr = match > 9 ? `${match}` : `0${match}`;
+    let day = date.getDate() + 1;
     return `${date.getFullYear()}-${matchStr}`;
 }
 
 export async function get比赛详情(mid) {
     let sql = "select * from match_information where m_id = Placeholder1";
-    let subSql = "select m_date from recent_match where m_id = Placeholder1 "
+    let subSql = "select m_date from recent_match where m_id <= Placeholder1 "
     let selectInfo = await selectOnceObjectData(sql, mid);
     let timeInfo = await selectOnceObjectData(subSql, mid);
     let selfScore = selectInfo.SELF_SCORE || 0;
     let opponentScore = selectInfo.OPPONENT_SCORE || 0;
     let matchResult = selfScore > opponentScore ? "胜" : "负";
+    //let firstDate = dataFormatInSubKey(timeInfo.M_DATE);
     let result = {
         mid:selectInfo.M_ID,
         selfName:selectInfo.SELF_NAME,
@@ -137,7 +139,7 @@ export async function get比赛详情(mid) {
         opponentScore:opponentScore,
         videoUrl:selectInfo.VIDEO_URL,
         result:matchResult,
-        date:timeInfo.M_DATE
+        date:dataFormat(timeInfo.M_DATE)
     };
     return result;
 }