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

pbl.js

@@ -736,6 +736,32 @@ router.route("/selectTipsTemplateById").all((req, res, next) => {
     getmysql(req, res, "selectTipsTemplateById", json["id"]);
 });
 
+//新增提示词
+router.route("/addTipsHK").all((req, res, next) => {
+    postmysql(req, res, "addTipsHK");
+});
+
+//保存提示词模板
+router.route("/addTipsTemplateHK").all((req, res, next) => {
+    postmysql(req, res, "addTipsTemplateHK");
+});
+
+//删除提示词模板
+router.route("/deleteTipsTemplateHK").all((req, res, next) => {
+    postmysql(req, res, "deleteTipsTemplateHK");
+});
+
+//查询模板
+router.route("/selectTipsTemplateHK").all((req, res, next) => {
+    var json = queryString(req.url);
+    getmysql(req, res, "selectTipsTemplateHK", json["userid"], json["oid"], json["org"], json["type"], json["name"]);
+});
+
+//查询模板
+router.route("/selectTipsTemplateByIdHK").all((req, res, next) => {
+    var json = queryString(req.url);
+    getmysql(req, res, "selectTipsTemplateByIdHK", json["id"]);
+});
 
 //新增课程
 router.route("/addWork").all((req, res, next) => {
@@ -1391,6 +1417,42 @@ router.route("/addWorkNew2AI2").all((req, res, next) => {
     }
 });
 
+router.route("/addWorkNew2AI3").all((req, res, next) => {
+    if (req.body[0]) {
+        p = [
+            req.body[0].uid,
+            req.body[0].title,
+            req.body[0].brief,
+            req.body[0].cover,
+            req.body[0].evaId,
+            req.body[0].astudent,
+            req.body[0].see,
+            req.body[0].chapters,
+            req.body[0].template,
+            req.body[0].ateacher,
+            req.body[0].refile,
+            req.body[0].reBrief,
+            req.body[0].cpote,
+            req.body[0].setting,
+            req.body[0].iresearch,
+        ];
+        p.unshift(_mysqlLabor[0], _mysqlLabor[1], "insert_teacher_work_new2_ai3"); //執行存儲過程
+        mysql.usselect(p, function(ret) {
+            let course = req.body[0].courseType;
+            let courseId = ret[0][0].courseId;
+            let userid = req.body[0].uid;
+            delCourseType(course, courseId, userid);
+            res.end(
+                JSON.stringify({
+                    ordernumber: ret[0][0].ordernumber,
+                    courseId: ret[0][0].courseId,
+                    success: 1,
+                })
+            );
+        });
+    }
+});
+
 
 router.route("/addWorkNew2New").all((req, res, next) => {
     if (req.body[0]) {
@@ -2120,6 +2182,37 @@ router.route("/updateWorkNew2AI2").all((req, res, next) => {
     }
 });
 
+router.route("/updateWorkNew2AI3").all((req, res, next) => {
+    if (req.body[0]) {
+        p = [
+            req.body[0].cid,
+            req.body[0].title,
+            req.body[0].brief,
+            req.body[0].cover,
+            req.body[0].evaId,
+            req.body[0].astudent,
+            req.body[0].see,
+            req.body[0].chapters,
+            req.body[0].template,
+            req.body[0].ateacher,
+            req.body[0].refile,
+            req.body[0].reBrief,
+            req.body[0].cpote,
+            req.body[0].setting,
+            req.body[0].iresearch,
+        ];
+        p.unshift(_mysqlLabor[0], _mysqlLabor[1], "update_teacher_work_new2_ai3"); //執行存儲過程
+        mysql.usselect(p, function(ret) {
+            let course = req.body[0].courseType;
+            let courseId = req.body[0].cid;
+            let userid = req.body[0].uid;
+            delCourseType(course, courseId, userid);
+            res.end(JSON.stringify({ success: 1 }));
+        });
+    }
+});
+
+
 router.route("/updateWorkNew2New").all((req, res, next) => {
     if (req.body[0]) {
         p = [
@@ -3639,6 +3732,12 @@ router.route("/getTestWorkShare").all((req, res, next) => {
     getmysql(req, res, "getTestWorkShare", json["id"]);
 });
 
+//查看评测
+router.route("/getTestWorkShareCopy").all((req, res, next) => {
+    var json = queryString(req.url);
+    getmysql(req, res, "getTestWorkShareCopy", json["id"], json["tea"]);
+});
+
 //查看课程
 router.route("/select_synergy").all((req, res, next) => {
     var json = queryString(req.url);
@@ -5726,7 +5825,21 @@ router.route("/selectCollaborativeMembersOrg").all(function(req, res, next) {
     getmysql(req, res, "selectCollaborativeMembersOrg", json["oid"], json["cu"], json["cn"], json["coll"]);
 });
 
+// 教师发展获取数据来源表单标题
+router.route("/selectExamineTestName").all(function(req, res, next) {
+    var json = queryString(req.url);
+    // console.log(json);
+    postmysql(req, res, "selectExamineTestName");
+    
+    // getmysql(req, res, "selectExamineTestName", json["testId"]);
+});
 
+// 教师发展 页面数据
+router.route("/selectTestExamineBase").all(function(req, res, next) {
+    var json = queryString(req.url);
+    
+    getmysql(req, res, "selectTestExamineBase", json["typ"], json["org"], json["oid"]);
+});
 
 
 // 获取教师管理table数据
@@ -6055,6 +6168,68 @@ router.route("/batchRegistrationSzdjg").post(function(req, res, next) {
     });
 });
 
+//深圳电教馆注册
+router.route("/batchRegistrationSzdjg2").post(function(req, res, next) {
+    var users = Object.values(req.body)[0].split(",");
+    //循环注册
+    var _username = users[0]; //名字
+    var _mail = users[1]; //用户名 账号
+    var _password = "123456";
+    var _alias = _username;
+    var _org = users[2];
+    var _oid = users[3];
+    var _ph = users[4];
+    var _class = users[5];
+    var _type = users[6];
+    var _openid = users[7];
+    var _dest = users[8];
+    //加密密碼
+    _password = bcrypt.hashSync(_password, bcrypt.genSaltSync(10));
+    //生成激活碼
+    let _hashstr = new Date().getTime() + "";
+    let _digest = crypto
+        .createHash("sha256")
+        .update(_hashstr, "utf8")
+        .digest("hex");
+    //用戶數據
+    var _userdata = [
+        _mail,
+        _password,
+        _alias,
+        "",
+        0,
+        _username,
+        _openid,
+        generateAPIKey(_username),
+        _digest,
+        "",
+        _username,
+        '',
+        _type,
+        _org,
+        _oid,
+        _ph,
+        _class,
+        "",
+        "0",
+        _dest
+    ];
+    //參數拼接，註冊
+    _userdata.unshift(_mysqluser[0], _mysqluser[1], "pbl_add_batchregisterSzdjg2");
+    //用戶註冊處理
+    mysql.usselect(_userdata, function(ret) {
+        res.end(
+            JSON.stringify({
+                uid: ret[1][0].uid,
+                ph: _ph,
+                oid: _oid,
+                cid: _class,
+                success: 1,
+            })
+        );
+    });
+});
+
 
 //新增教师
 router.route("/batchRegistration1").post(function(req, res, next) {
@@ -7088,6 +7263,12 @@ router.route("/getTestWorksNoPage").all((req, res, next) => {
     getmysql(req, res, "getTestWorksNoPage", json["cid"], json["cn"]);
 });
 
+//评测中心-获取评测提交详情 yym
+router.route("/getTestWorksNoPageCopy").all((req, res, next) => {
+    var json = queryString(req.url);
+    getmysql(req, res, "getTestWorksNoPageCopy", json["cid"], json["cn"], json["tim"], json["tea"]);
+});
+
 
 //评测中心-获取评测提交详情
 router.route("/getTestWorksPage2").all((req, res, next) => {
@@ -7101,6 +7282,17 @@ router.route("/getTestWorksPerson").all((req, res, next) => {
     getmysql(req, res, "getTestWorksPerson", json["uid"], json["typeid"]);
 });
 
+//教师发展-考核-查询是否有提交的的数据
+router.route("/getTestExamineByUserId").all((req, res, next) => {
+    var json = queryString(req.url);
+    getmysql(req, res, "getTestExamineByUserId", json["uid"], json["type"]);
+});
+
+//教师发展-考核-查询是否有提交的的数据
+router.route("/addTestExamineWorks").all((req, res, next) => {
+    postmysql(req, res, "addTestExamineWorks");
+});
+
 //查询英语写作评价模板
 router.route("/selectEnglishEva").all((req, res, next) => {
     var json = queryString(req.url);