课程分类

src/custom/restcontroller/R.java

@@ -5492,6 +5492,16 @@ public class R {
         public static class v1 {
         }
     }
+
+    public static class ID20240313144002 {
+        public static class v1 {
+        }
+    }
+
+    public static class ID20240313152302 {
+        public static class v1 {
+        }
+    }
 }
 
 

src/custom/restcontroller/webmanage/saletool/courseware/SQL/课程分类-新增.sql

@@ -10,7 +10,8 @@ INSERT INTO sat_courseware_class (sat_courseware_classid,
                                   parentid,
                                   issystem,
                                   isenable,
-                                  level)
+                                  level,
+                                  sequence)
 VALUES ($sat_courseware_classid$,
         $siteid$,
         $createuserid$,
@@ -23,7 +24,8 @@ VALUES ($sat_courseware_classid$,
         $parentid$,
         0,
         $isenable$,
-        $level$)
+        $level$,
+        $sequence$)
 
 
 

src/custom/restcontroller/webmanage/saletool/courseware/SQL/课程分类-更新.sql

@@ -5,5 +5,6 @@ SET classname=$classname$,
     changeby = $changeby$,
     level = $level$,
     parentid = $parentid$,
-    isenable = $isenable$
+    isenable = $isenable$,
+    sequence=$sequence$
 WHERE sat_courseware_classid = $sat_courseware_classid$

src/custom/restcontroller/webmanage/saletool/courseware/SQL/课程分类-查询.sql

@@ -1,5 +1,5 @@
-SELECT sat_courseware_classid, classname, parentid, createdate, isenable,issystem
+SELECT sat_courseware_classid, classname, parentid, createdate, isenable,issystem,sequence
 FROM sat_courseware_class
 WHERE parentid = $parentid$
   and siteid = $siteid$ and $where$
-ORDER BY issystem DESC, createdate DESC
+ORDER BY sequence

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

@@ -1,5 +1,6 @@
 package restcontroller.webmanage.saletool.courseware;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import common.Controller;
 import common.YosException;
@@ -10,7 +11,10 @@ import common.annotation.cm;
 import common.data.Row;
 import common.data.Rows;
 import common.data.SQLFactory;
+import common.data.UpdateSQL;
 import restcontroller.R;
+import restcontroller.webmanage.saletool.notice.notice;
+import restcontroller.webmanage.saletool.notice.noticeclass;
 
 import java.util.ArrayList;
 
@@ -20,13 +24,13 @@ public class coursewareclass extends Controller {
         super(content);
     }
 
-    @API(title = "新增")
+    @API(title = "新增", apiversion = R.ID20240313144002.v1.class)
     @CACHEING_CLEAN(cms = {@cm(clazz = coursewareclass.class, method = {"select"})})
     public String insertOrUpdate() throws YosException {
         Long sat_courseware_classid = content.getLong("sat_courseware_classid");
-        String classname = content.getString("classname", "sat_courseware_class");
-        boolean isenable = content.getBoolean("isenable");
-        Long parentid = content.getLong("parentid");
+        String classname = content.getStringValue("classname", "sat_courseware_class");
+        boolean isenable = content.getBooleanValue("isenable");
+        Long parentid = content.getLongValue("parentid");
         long level = 1;
         if (parentid == 0) {
             level = 1;
@@ -55,6 +59,7 @@ public class coursewareclass extends Controller {
         sqlFactory.addParameter("parentid", parentid);
         sqlFactory.addParameter("level", level);
         sqlFactory.addParameter("isenable", isenable);
+        sqlFactory.addParameter("sequence", content.getLongValue("sequence"));
 
 
         dbConnect.runSqlUpdate(sqlFactory);
@@ -65,11 +70,14 @@ public class coursewareclass extends Controller {
     @API(title = "删除", apiversion = R.ID20221102143702.v1.class)
     @CACHEING_CLEAN(cms = {@cm(clazz = coursewareclass.class, method = {"select"}), @cm(clazz = courseware.class, method = {"select"})})
     public String delete() throws YosException {
-        Long sat_courseware_classid = content.getLong("sat_courseware_classid");
-        Rows rows = dbConnect.runSqlQuery("select issystem,parentid  from sat_courseware_class where sat_courseware_classid=" + sat_courseware_classid);
-        if (rows.isEmpty()) {
-            return getErrReturnObject().setErrMsg("当前分类不存在，无法删除").toString();
-        } else {
+        JSONArray sat_courseware_classids = content.getJSONArray("sat_courseware_classids");
+        ArrayList<String> sqllist = new ArrayList<>();
+        for (Object obj : sat_courseware_classids) {
+            String sat_courseware_classid = obj.toString();
+            Rows rows = dbConnect.runSqlQuery("select issystem,parentid  from sat_courseware_class where sat_courseware_classid=" + sat_courseware_classid);
+            if (rows.isEmpty()) {
+                return getErrReturnObject().setErrMsg("当前分类不存在，无法删除").toString();
+            }
             if (rows.get(0).getBoolean("issystem")) {
                 return getErrReturnObject().setErrMsg("当前分类为系统分类，无法删除").toString();
             }
@@ -79,23 +87,18 @@ public class coursewareclass extends Controller {
                     return getErrReturnObject().setErrMsg("当前分类下包含子类，无法删除").toString();
                 }
             }
+            if (!dbConnect.runSqlQuery("select 1 from sat_courseware where sat_courseware_classid=" + sat_courseware_classid + " and  siteid='" + siteid + "'").isEmpty()) {
+                return getErrReturnObject().setErrMsg("当前分类下存在课程，无法删除").toString();
+            }
+            String deletesql = "DELETE FROM sat_courseware_class WHERE sat_courseware_classid = '" + sat_courseware_classid + "'";
+            sqllist.add(deletesql);
         }
-        Rows rowssite = dbConnect.runSqlQuery("select sat_courseware_classid from sat_courseware_class where issystem=1 AND parentid !=0 and  siteid='" + siteid + "'");
-        if (rowssite.isEmpty()) {
-            return getErrReturnObject().setErrMsg("当前分类下不存在系统板块，无法删除").toString();
-        }
-        ArrayList<String> sqllist = new ArrayList<>();
-        String deletesql = "DELETE FROM sat_courseware_class WHERE sat_courseware_classid = '" + sat_courseware_classid + "'";
-        sqllist.add(deletesql);
-        if (rows.get(0).getLong("parentid") != 0) {
-            String updatesql = "update sat_courseware set sat_courseware_classid=" + rowssite.get(0).getLong("sat_courseware_classid") + " where sat_courseware_classid = '" + sat_courseware_classid + "'";
-            sqllist.add(updatesql);
-        }
+
         dbConnect.runSqlUpdate(sqllist);
         return getSucReturnObject().toString();
     }
 
-    @API(title = "查询",apiversion = R.ID20221102143302.v1.class)
+    @API(title = "查询", apiversion = R.ID20221102143302.v1.class)
     @CACHEING
     public String select() throws YosException {
 
@@ -107,14 +110,14 @@ public class coursewareclass extends Controller {
             JSONObject whereObject = content.getJSONObject("where");
             if (whereObject.containsKey("isenable") && !"".equals(whereObject.getString("isenable"))) {
                 where.append(" and (");
-                where.append(whereObject.getBoolean("isenable"));
+                where.append("isenable="+whereObject.getBooleanValue("isenable"));
                 where.append(")");
             }
 
 
         }
 
-        Long parentid = content.getLong("parentid");
+        Long parentid = content.getLongValue("parentid");
         SQLFactory sqlFactory = new SQLFactory(this, "课程分类-查询");
         sqlFactory.addParameter("parentid", parentid);
         sqlFactory.addParameter("siteid", siteid);
@@ -135,4 +138,20 @@ public class coursewareclass extends Controller {
         return getSucReturnObject().setData(resRows).toString();
     }
 
+    @API(title = "启用", apiversion = R.ID20240313152302.v1.class)
+    @CACHEING_CLEAN(cms = {@cm(clazz = coursewareclass.class, method = {"select"}), @cm(clazz = courseware.class, method = {"select"})})
+    public String isenadle() throws YosException {
+        JSONArray sat_courseware_classids = content.getJSONArray("sat_courseware_classids");
+
+        UpdateSQL updateSQL=SQLFactory.createUpdateSQL(this,"sat_courseware_class");
+        updateSQL.setSiteid(siteid);
+        updateSQL.setValue("isenable", content.getBooleanValue("isenable"));
+        updateSQL.setWhere("sat_courseware_classid ", sat_courseware_classids.toArray());
+        updateSQL.update();
+
+
+
+        return getSucReturnObject().toString();
+    }
+
 }

src/custom/restcontroller/webmanage/saletool/notice/noticeclass.java

@@ -140,7 +140,7 @@ public class noticeclass extends Controller {
 
     }
 
-    @API(title = "删除", apiversion = R.ID20240313102402.v1.class)
+    @API(title = "启用", apiversion = R.ID20240313102402.v1.class)
     @CACHEING_CLEAN(cms = {@cm(clazz = noticeclass.class, method = {"queryNoticeClass"}), @cm(clazz = notice.class, method = {"queryNoticeList"})})
     public String isenadle() throws YosException {
         JSONArray sat_notice_classids = content.getJSONArray("sat_notice_classids");