新增预约字段

src/custom/restcontroller/webmanage/saletool/appointment/Appointment.java

@@ -42,6 +42,11 @@ public class Appointment extends Controller {
             }
         }
 
+        JSONObject extrajson = new JSONObject();
+        if (content.containsKey("extrajson")) {
+            extrajson = content.getJSONObject("extrajson");
+        }
+
 
         InsertSQL insertSQL = SQLFactory.createInsertSQL(this, "sa_appointment");
         insertSQL.setUniqueid(createTableID("sa_appointment"));
@@ -57,6 +62,8 @@ public class Appointment extends Controller {
         insertSQL.setValue("type", content.getStringValue("type"));
         insertSQL.setValue("shareuserid", shareuserid);
         insertSQL.setValue("sharename", sharename);
+        insertSQL.setValue("typemx", content.getStringValue("typemx"));
+        insertSQL.setValue("extrajson", extrajson);
         insertSQL.insert();
 
         return getSucReturnObject().toString();

src/custom/restcontroller/webmanage/saletool/courseware/coursewaretesthead.java

@@ -366,8 +366,8 @@ public class coursewaretesthead extends Controller {
         }
         Rows testRows = dbConnect.runSqlQuery("SELECT sat_courseware_testid from sat_courseware_test WHERE sat_courseware_testheadid=" + sat_courseware_testheadid + " and userid=" + userid + " and siteid='" + siteid + "'");
         if (testRows.isNotEmpty()) {
-            Long sat_courseware_testid=testRows.get(0).getLong("sat_courseware_testid");
-            content.put("sat_courseware_testid",sat_courseware_testid);
+            Long sat_courseware_testid = testRows.get(0).getLong("sat_courseware_testid");
+            content.put("sat_courseware_testid", sat_courseware_testid);
             return testinfo();
         }
 
@@ -433,26 +433,26 @@ public class coursewaretesthead extends Controller {
         }
         Long sat_courseware_testheadid = content.getLongValue("sat_courseware_testheadid");
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_usersite"
-                ,"userid")
+                        , "userid")
                 .setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.inner,"sat_courseware_testhead","t2","t2.siteid=t1.siteid"
-                ,"sat_courseware_testheadid","num");
-        querySQL.addJoinTable(JOINTYPE.left,"sat_courseware_test","t3","t3.userid=t1.userid and t3.siteid=t1.siteid and t3.sat_courseware_testheadid="+sat_courseware_testheadid
-                ,"sat_courseware_testid");
-        querySQL.addJoinTable(JOINTYPE.inner,"sys_dataauth_view","t4","t4.userid=t1.userid and t4.siteid=t1.siteid and t4.ownertable='sat_courseware_testhead' and t4.ownerid="+sat_courseware_testheadid +" and t4.siteid='"+siteid+"'");
-        querySQL.addJoinTable(JOINTYPE.inner,"sys_users","t5","t5.userid=t1.userid");
-        querySQL.addQueryFields("name","CONCAT(t5.name,'-',t5.accountno)");
-        querySQL.addQueryFields("score","IFNULL(t3.score,0)");
-        querySQL.addQueryFields("answercount","IFNULL(t3.answercount,0)");
-        querySQL.addQueryFields("errcount","IFNULL(t3.errcount,0)");
-        querySQL.addQueryFields("begdate","IFNULL(t3.begdate,'')");
-        querySQL.addQueryFields("status","IFNULL(t3.`status`,'未开始')");
-        querySQL.addQueryFields("rightcount","IFNULL(t3.`rightcount`,0)");
+        querySQL.addJoinTable(JOINTYPE.inner, "sat_courseware_testhead", "t2", "t2.siteid=t1.siteid"
+                , "sat_courseware_testheadid", "num");
+        querySQL.addJoinTable(JOINTYPE.left, "sat_courseware_test", "t3", "t3.userid=t1.userid and t3.siteid=t1.siteid and t3.sat_courseware_testheadid=" + sat_courseware_testheadid
+                , "sat_courseware_testid");
+        querySQL.addJoinTable(JOINTYPE.inner, "sys_dataauth_view", "t4", "t4.userid=t1.userid and t4.siteid=t1.siteid and t4.ownertable='sat_courseware_testhead' and t4.ownerid=" + sat_courseware_testheadid + " and t4.siteid='" + siteid + "'");
+        querySQL.addJoinTable(JOINTYPE.inner, "sys_users", "t5", "t5.userid=t1.userid");
+        querySQL.addQueryFields("name", "CONCAT(t5.name,'-',t5.accountno)");
+        querySQL.addQueryFields("score", "IFNULL(t3.score,0)");
+        querySQL.addQueryFields("answercount", "IFNULL(t3.answercount,0)");
+        querySQL.addQueryFields("errcount", "IFNULL(t3.errcount,0)");
+        querySQL.addQueryFields("begdate", "IFNULL(t3.begdate,'')");
+        querySQL.addQueryFields("status", "IFNULL(t3.`status`,'未开始')");
+        querySQL.addQueryFields("rightcount", "IFNULL(t3.`rightcount`,0)");
         querySQL.setWhere(where.toString());
         querySQL.setSiteid(siteid);
         querySQL.setWhere("t2.sat_courseware_testheadid", sat_courseware_testheadid);
-        if(pageSorting.equals("''")){
-            pageSorting="t3.`status` desc";
+        if (pageSorting.equals("''")) {
+            pageSorting = "t3.`status` desc";
         }
         querySQL.setPage(pageSize, pageNumber).setOrderBy(pageSorting);
         Rows rows = querySQL.query();
@@ -516,7 +516,7 @@ public class coursewaretesthead extends Controller {
             JSONArray answer = row.getJSONArray("answer");
             row.put("answer", answer);
 
-            Rows optionsrows= Attachment.get(this,"sat_courseware_testitems",row.getLong("sat_courseware_testitemsid"));
+            Rows optionsrows = Attachment.get(this, "sat_courseware_testitems", row.getLong("sat_courseware_testitemsid"));
             row.put("attinfos", optionsrows);
         }
 
@@ -569,8 +569,8 @@ public class coursewaretesthead extends Controller {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sat_courseware_testhead"
                         , "sat_courseware_testheadid", "title", "num")
                 .setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.left, "sat_courseware_test", "t2", "t2.sat_courseware_testheadid=t1.sat_courseware_testheadid and t2.siteid=t1.siteid"
-                , "answercount","status","score");
+        querySQL.addJoinTable(JOINTYPE.left, "sat_courseware_test", "t2", "t2.sat_courseware_testheadid=t1.sat_courseware_testheadid and t2.siteid=t1.siteid  and t2.userid = " + userid
+                , "answercount", "status", "score");
         querySQL.setPage(pageSize, pageNumber).setOrderBy(pageSorting);
         querySQL.setSiteid(siteid);
         querySQL.setWhere("status", "发布");