Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-api

pbl.js

@@ -302,8 +302,8 @@ router.route("/insertClass").all((req, res, next) => {
 });
 /* 新增教研室 */
 router.route("/insertTeacherOffice").all((req, res, next) => {
-  var json = queryString(req.url);
-  getmysql(req, res, "insertTeacherOffice", json["name"], json["oid"], json["uid"]);
+    var json = queryString(req.url);
+    getmysql(req, res, "insertTeacherOffice", json["name"], json["oid"], json["uid"]);
 });
 /* 新增年级 */
 router.route("/insertGrade").all((req, res, next) => {
@@ -318,8 +318,8 @@ router.route("/updateClass").all((req, res, next) => {
 });
 // 修改教研室
 router.route("/updateTeacherOffice").all((req, res, next) => {
-  var json = queryString(req.url);
-  getmysql(req, res, "updateTeacherOffice", json["id"], json["n"], json["oid"]);
+    var json = queryString(req.url);
+    getmysql(req, res, "updateTeacherOffice", json["id"], json["n"], json["oid"]);
 });
 
 /* 修改年级 */
@@ -334,8 +334,8 @@ router.route("/selectClass").all((req, res, next) => {
 });
 // 教研室查询
 router.route("/selectTeacherOffice").all((req, res, next) => {
-  var json = queryString(req.url);
-  getmysql(req,res,"selectTeacherOffice",json["cu"],json["oid"],json["cn"],json["page"],10);
+    var json = queryString(req.url);
+    getmysql(req, res, "selectTeacherOffice", json["cu"], json["oid"], json["cn"], json["page"], 10);
 });
 /* 查询班级 */
 router.route("/selectClass2").all((req, res, next) => {
@@ -1008,18 +1008,18 @@ router.route("/selectStudent2").all((req, res, next) => {
 });
 /* 查询教师 */
 router.route("/selectTeacher2").all((req, res, next) => {
-  var json = queryString(req.url);
-  getmysql(
-      req,
-      res,
-      "selectTeacher2",
-      json["oid"],
-      json["cu"],
-      json["cn"],
-      json["cid"],
-      json["page"],
-      10
-  );
+    var json = queryString(req.url);
+    getmysql(
+        req,
+        res,
+        "selectTeacher2",
+        json["oid"],
+        json["cu"],
+        json["cn"],
+        json["cid"],
+        json["page"],
+        10
+    );
 });
 
 /* 查询教师 */
@@ -2260,8 +2260,8 @@ router.route("/selectClassBySchool").all((req, res, next) => {
 });
 //查询学校底下的教研室
 router.route("/selectTeacherOfficeBySchool").all((req, res, next) => {
-  var json = queryString(req.url);
-  getmysql(req, res, "selectTeacherOfficeBySchool", json["oid"]);
+    var json = queryString(req.url);
+    getmysql(req, res, "selectTeacherOfficeBySchool", json["oid"]);
 });
 
 //查询学校底下的年级
@@ -3145,17 +3145,17 @@ router.route("/getClassStudent").all((req, res, next) => {
 });
 //查询未在此教研室的老师
 router.route("/getClassTeacher").all((req, res, next) => {
-  var json = queryString(req.url);
-  getmysql(
-      req,
-      res,
-      "getClassTeacher",
-      json["cid"],
-      json["oid"],
-      json["cn"],
-      json["page"],
-      json["num"]
-  );
+    var json = queryString(req.url);
+    getmysql(
+        req,
+        res,
+        "getClassTeacher",
+        json["cid"],
+        json["oid"],
+        json["cn"],
+        json["page"],
+        json["num"]
+    );
 });
 
 //查询未在此年级的班级
@@ -3182,7 +3182,7 @@ router.route("/addClassStudent").all((req, res, next) => {
         mysql.usselect(_userdata, function(ret) {
             let classid = ret[0][0].classid;
             if (!classid || classid.indexOf(cid) == -1) {
-                classid = classid ? classid.split(",") : []; 
+                classid = classid ? classid.split(",") : [];
                 classid.push(cid);
                 let _userdata2 = [student[i], classid.join(",")];
                 _userdata2.unshift(
@@ -3201,30 +3201,30 @@ router.route("/addClassStudent").all((req, res, next) => {
 });
 //添加老师到教研室
 router.route("/addClassTeacher").all((req, res, next) => {
-  let cid = req.body[0].cid;
-  let student = JSON.parse(req.body[0].student);
-  for (let i = 0; i < student.length; i++) {
-      let _userdata = [student[i]];
-      _userdata.unshift(_mysqlLabor[0], _mysqlLabor[1], "selectUser");
-      mysql.usselect(_userdata, function(ret) {
-          let classid = ret[0][0].cclassid;
-          if (!classid || classid.indexOf(cid) == -1) {
-              classid = classid ? classid.split(",") : []; 
-              classid.push(cid);
-              let _userdata2 = [student[i], classid.join(",")];
-              _userdata2.unshift(
-                  _mysqlLabor[0],
-                  _mysqlLabor[1],
-                  "updateTeacherClass"
-              );
-              mysql.usselect(_userdata2, function(ret) {
-                  if (i == student.length - 1) {
-                      res.end(JSON.stringify({ success: 1 }));
-                  }
-              });
-          }
-      });
-  }
+    let cid = req.body[0].cid;
+    let student = JSON.parse(req.body[0].student);
+    for (let i = 0; i < student.length; i++) {
+        let _userdata = [student[i]];
+        _userdata.unshift(_mysqlLabor[0], _mysqlLabor[1], "selectUser");
+        mysql.usselect(_userdata, function(ret) {
+            let classid = ret[0][0].cclassid;
+            if (!classid || classid.indexOf(cid) == -1) {
+                classid = classid ? classid.split(",") : [];
+                classid.push(cid);
+                let _userdata2 = [student[i], classid.join(",")];
+                _userdata2.unshift(
+                    _mysqlLabor[0],
+                    _mysqlLabor[1],
+                    "updateTeacherClass"
+                );
+                mysql.usselect(_userdata2, function(ret) {
+                    if (i == student.length - 1) {
+                        res.end(JSON.stringify({ success: 1 }));
+                    }
+                });
+            }
+        });
+    }
 });
 //添加班级到年级
 router.route("/addGradeClass").all((req, res, next) => {
@@ -3261,22 +3261,22 @@ router.route("/deleteClassStudent").all((req, res, next) => {
 });
 //移除学生此班级
 router.route("/deleteClassTeacher").all((req, res, next) => {
-  let cid = req.body[0].cid;
-  let student = req.body[0].uid;
-  let _userdata = [student];
-  _userdata.unshift(_mysqlLabor[0], _mysqlLabor[1], "selectUser");
-  mysql.usselect(_userdata, function(ret) {
-      let classid = ret[0][0].cclassid;
-      if (classid.indexOf(cid) != -1) {
-          classid = classid.split(",");
-          classid.splice(classid.indexOf(cid), 1);
-          let _userdata2 = [student, classid.join(",")];
-          _userdata2.unshift(_mysqlLabor[0], _mysqlLabor[1], "updateTeacherClass");
-          mysql.usselect(_userdata2, function(ret) {
-              res.end(JSON.stringify({ success: 1 }));
-          });
-      }
-  });
+    let cid = req.body[0].cid;
+    let student = req.body[0].uid;
+    let _userdata = [student];
+    _userdata.unshift(_mysqlLabor[0], _mysqlLabor[1], "selectUser");
+    mysql.usselect(_userdata, function(ret) {
+        let classid = ret[0][0].cclassid;
+        if (classid.indexOf(cid) != -1) {
+            classid = classid.split(",");
+            classid.splice(classid.indexOf(cid), 1);
+            let _userdata2 = [student, classid.join(",")];
+            _userdata2.unshift(_mysqlLabor[0], _mysqlLabor[1], "updateTeacherClass");
+            mysql.usselect(_userdata2, function(ret) {
+                res.end(JSON.stringify({ success: 1 }));
+            });
+        }
+    });
 });
 //移除班级
 router.route("/deleteGradeClass").all((req, res, next) => {
@@ -3729,6 +3729,7 @@ router.route("/selectPoint").all((req, res, next) => {
         json["typeE"],
         json["cn"],
         json["cid"],
+        json["title"],
         json["page"],
         10
     );
@@ -3747,10 +3748,28 @@ router.route("/selectPoint1").all((req, res, next) => {
         json["typeE"],
         json["cn"],
         json["cid"],
+        json["title"],
         json["page"],
         10
     );
 });
+//根据市级管理者查询全部评分
+router.route("/selectPointAll").all((req, res, next) => {
+    var json = queryString(req.url);
+    getmysql(
+        req,
+        res,
+        "selectPointAll",
+        json["typea"],
+        json["typeb"],
+        json["typec"],
+        json["typed"],
+        json["typeE"],
+        json["cn"],
+        json["cid"],
+        json["title"]
+    );
+});
 //查询分配案例
 router.route("/selectCaseUser").all((req, res, next) => {
     var json = queryString(req.url);