生成试卷逻辑修改

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

@@ -362,6 +362,13 @@ public class coursewaretesthead extends Controller {
         if (testheadRows.isEmpty()) {
             return getErrReturnObject().setErrMsg("考试不存在").toString();
         }
+        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);
+            return testinfo();
+        }
+
         int testaddmode = testheadRows.get(0).getInteger("testaddmode");
         int num = testheadRows.get(0).getInteger("num");
         JSONArray testquestions = testheadRows.get(0).getJSONArray("testquestions");
@@ -380,10 +387,9 @@ public class coursewaretesthead extends Controller {
         ArrayList<String> sqlList = CoursewareHelper.getCoursewareTestSql(this, sat_courseware_testheadid, sat_courseware_testid, testquestions);
         dbConnect.runSqlUpdate(sqlList);
 
-        Row row = new Row();
-        row.put("sat_courseware_testid", sat_courseware_testid);
+        content.put("sat_courseware_testid", sat_courseware_testid);
 
-        return getSucReturnObject().setData(row).toString();
+        return testinfo();
     }
 
     @API(title = "删除试卷", apiversion = R.ID20240325105502.v1.class)
@@ -543,10 +549,10 @@ public class coursewaretesthead extends Controller {
 
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sat_courseware_testhead"
-                ,"sat_courseware_testheadid","title","num")
+                        , "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");
+        querySQL.addJoinTable(JOINTYPE.left, "sat_courseware_test", "t2", "t2.sat_courseware_testheadid=t1.sat_courseware_testheadid and t2.siteid=t1.siteid"
+                , "answercount");
         querySQL.setPage(pageSize, pageNumber).setOrderBy(pageSorting);
         querySQL.setSiteid(siteid);
         querySQL.setWhere("status", "发布");