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