Commit 6674ffbd by lixinming

2.1修bug 管理后台表格异常,管理后台分数查询不到

parent e5651c63
...@@ -187,7 +187,7 @@ export async function outPutFuHuaQiBaseData(lv:number, institutionalNature:numbe ...@@ -187,7 +187,7 @@ export async function outPutFuHuaQiBaseData(lv:number, institutionalNature:numbe
/**生成除了创始团队和场地之外的 小数组 */ /**生成除了创始团队和场地之外的 小数组 */
let subList = []; let subList = [];
keyList.forEach(subInfo => { keyList.forEach(subInfo => {
subList.push(info[subInfo] || ''); subList.push(changeData[subInfo] || '');
}); });
dataList.push(subList); dataList.push(subList);
...@@ -382,9 +382,9 @@ export async function fuHuaQiScore(time:number, name:string, page:number) { ...@@ -382,9 +382,9 @@ export async function fuHuaQiScore(time:number, name:string, page:number) {
} else { } else {
let datList = await scoreLogData.getUptotheminuteScore(time); let endT = moment(time).endOf('month').valueOf();
let datList = await scoreLogData.getUptotheminuteScore(time, endT);
rankList
datList.forEach(info => { datList.forEach(info => {
let name = nameMap[info._id] let name = nameMap[info._id]
if (!name) return; if (!name) return;
...@@ -429,7 +429,8 @@ export async function outPutFuHuaQiScore(time:number) { ...@@ -429,7 +429,8 @@ export async function outPutFuHuaQiScore(time:number) {
} else { } else {
let datList = await scoreLogData.getUptotheminuteScore(time); let endT = moment(time).endOf('month').valueOf();
let datList = await scoreLogData.getUptotheminuteScore(time, endT);
outPutName = `${new Date(time).getFullYear()}${new Date(time).getMonth() + 1}月`; outPutName = `${new Date(time).getFullYear()}${new Date(time).getMonth() + 1}月`;
rankList rankList
datList.forEach(info => { datList.forEach(info => {
......
...@@ -64,9 +64,9 @@ export async function getLog(uscc:string, startTime:number, endTime:number) { ...@@ -64,9 +64,9 @@ export async function getLog(uscc:string, startTime:number, endTime:number) {
* @param timeMs * @param timeMs
* @returns * @returns
*/ */
export async function getUptotheminuteScore(timeMs:number) { export async function getUptotheminuteScore(startTimeMs:number, endTimeMs:number) {
return await fuHuaQiScoreLogModel.aggregate([ return await fuHuaQiScoreLogModel.aggregate([
{"$match":{ timeMs :{"$lt":timeMs } } }, {"$match":{ timeMs :{"$gt":startTimeMs, "$lt":endTimeMs } } },
{"$project":{ score:1, uscc:1, timeMs:1 } }, {"$project":{ score:1, uscc:1, timeMs:1 } },
{"$group":{_id:"$uscc", maxScore:{"$last":"$score"} } } {"$group":{_id:"$uscc", maxScore:{"$last":"$score"} } }
]); ]);
......
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