chengjie месяцев назад: 7
Родитель
Сommit
351e257354
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      src/api/mps/mpsScoreController.js

+ 2 - 2
src/api/mps/mpsScoreController.js

@@ -68,7 +68,7 @@ export async function GetMPSDistrictPersonNum(ctx) {
68
         Year: ctx.query.Year || ArrYear[0].Name,
68
         Year: ctx.query.Year || ArrYear[0].Name,
69
     };
69
     };
70
 
70
 
71
-    if (param.DistrictID==10 || param.DistrictID==15 || param.DistrictID==16 )
71
+    if (param.DistrictID==10 || param.DistrictID==16 )
72
         param.Year=ArrYear[1].Name;
72
         param.Year=ArrYear[1].Name;
73
 
73
 
74
     let info=null;
74
     let info=null;
@@ -89,7 +89,7 @@ export async function GetMPSDistrictPersonNum(ctx) {
89
                 str = " and s.DistrictID=" + param.DistrictID;
89
                 str = " and s.DistrictID=" + param.DistrictID;
90
             const arr = [];
90
             const arr = [];
91
             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;";
91
             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;";
92
-
92
+            //console.log(sql);
93
             const list = await commonModel.RunSql({}, sql);
93
             const list = await commonModel.RunSql({}, sql);
94
             if (list && list.length > 0) {
94
             if (list && list.length > 0) {
95
                 for(let i=0;i<list.length;i++){
95
                 for(let i=0;i<list.length;i++){