0

src/api/mps/mpsScoreController.js

@@ -68,52 +68,56 @@ export async function GetMPSDistrictPersonNum(ctx) {
         Year: ctx.query.Year || ArrYear[1].Name,
     };
 
-    const url = "GetMPSDistrictPersonNum?DistrictID=" + param.DistrictID;
+    let info=null;
+    if (param.DistrictID!="NaN"){
 
-    let info = await BufferMemoryClass.get(url);
+        const url = "GetMPSDistrictPersonNum?DistrictID=" + param.DistrictID;
 
-    if (process.env.NODE_ENV == 'development')
-        info = [];
+        info = await BufferMemoryClass.get(url);
 
-    if (!info || info.length == 0) {
-        const year2 = Number(param.Year) - 1;
+        if (process.env.NODE_ENV == 'development')
+            info = [];
 
-        let str = "";
-        if (param.DistrictID && param.DistrictID != 0)
-            str = " and s.DistrictID=" + param.DistrictID;
-        const arr = [];
-        const sql = "select c.SchoolType2Short,s.ScoreYear,sum(s.PlanNum) as PlanNum from MPS_Score s inner join MPS_School c on s.SchoolTarget=c.ID where s.ScoreYear in ('" + year2 + "','" + param.Year + "') and s.SchoolTargetRemark not in('4国际(本市)','5国际(非本市)') and s.PlanNum>0 " + str + " group by c.SchoolType2Short,s.ScoreYear order by c.SchoolType2Short desc,s.ScoreYear;";
+        if (!info || info.length == 0) {
+            const year2 = Number(param.Year) - 1;
 
-        const list = await commonModel.RunSql({}, sql);
-        if (list && list.length > 0) {
-            for(let i=0;i<list.length;i++){
-                list[i].PlanNum=Number(list[i].PlanNum);
+            let str = "";
+            if (param.DistrictID && param.DistrictID != 0)
+                str = " and s.DistrictID=" + param.DistrictID;
+            const arr = [];
+            const sql = "select c.SchoolType2Short,s.ScoreYear,sum(s.PlanNum) as PlanNum from MPS_Score s inner join MPS_School c on s.SchoolTarget=c.ID where s.ScoreYear in ('" + year2 + "','" + param.Year + "') and s.SchoolTargetRemark not in('4国际(本市)','5国际(非本市)') and s.PlanNum>0 " + str + " group by c.SchoolType2Short,s.ScoreYear order by c.SchoolType2Short desc,s.ScoreYear;";
+
+            const list = await commonModel.RunSql({}, sql);
+            if (list && list.length > 0) {
+                for(let i=0;i<list.length;i++){
+                    list[i].PlanNum=Number(list[i].PlanNum);
+                }
+                arr.push({ "Name": "能上" + list[1].SchoolType2Short, "Year1": list[1].PlanNum, "Year2": list[1].PlanNum - list[0].PlanNum });
+                arr.push({ "Name": "能上" + list[5].SchoolType2Short, "Year1": list[5].PlanNum + list[3].PlanNum, "Year2": list[5].PlanNum + list[3].PlanNum - list[4].PlanNum - list[2].PlanNum });
+                arr.push({ "Name": "能上" + list[7].SchoolType2Short, "Year1": list[7].PlanNum, "Year2": list[7].PlanNum - list[6].PlanNum });
+                arr.push({ "Name": "能上高中总计", "Year1": arr[0].Year1 + arr[1].Year1 + arr[2].Year1, "Year2": arr[0].Year2 + arr[1].Year2 + arr[2].Year2 });
+
+                arr[0].Rate = Math.round(100 * arr[0].Year1 / arr[3].Year1);
+                arr[1].Rate = Math.round(100 * arr[1].Year1 / arr[3].Year1);
+                arr[2].Rate = Math.round(100 * arr[2].Year1 / arr[3].Year1);
             }
-            arr.push({ "Name": "能上" + list[1].SchoolType2Short, "Year1": list[1].PlanNum, "Year2": list[1].PlanNum - list[0].PlanNum });
-            arr.push({ "Name": "能上" + list[5].SchoolType2Short, "Year1": list[5].PlanNum + list[3].PlanNum, "Year2": list[5].PlanNum + list[3].PlanNum - list[4].PlanNum - list[2].PlanNum });
-            arr.push({ "Name": "能上" + list[7].SchoolType2Short, "Year1": list[7].PlanNum, "Year2": list[7].PlanNum - list[6].PlanNum });
-            arr.push({ "Name": "能上高中总计", "Year1": arr[0].Year1 + arr[1].Year1 + arr[2].Year1, "Year2": arr[0].Year2 + arr[1].Year2 + arr[2].Year2 });
-
-            arr[0].Rate = Math.round(100 * arr[0].Year1 / arr[3].Year1);
-            arr[1].Rate = Math.round(100 * arr[1].Year1 / arr[3].Year1);
-            arr[2].Rate = Math.round(100 * arr[2].Year1 / arr[3].Year1);
-        }
 
-        info = {
-            Year: param.Year,
-            List: arr
-        };
+            info = {
+                Year: param.Year,
+                List: arr
+            };
 
-        const obj = {
-            KeyName: url,
-            ValueString: JSON.stringify(info)
-        };
-        await BufferMemoryClass.add(obj);
-        console.log("缓存");
-    }
-    else {
-        info = info[0].ValueString;
-        info = JSON.parse(info);
+            const obj = {
+                KeyName: url,
+                ValueString: JSON.stringify(info)
+            };
+            await BufferMemoryClass.add(obj);
+            console.log("缓存");
+        }
+        else {
+            info = info[0].ValueString;
+            info = JSON.parse(info);
+        }
     }
 
     ctx.body = { "errcode": 10000, result: info };