eganwu 2 سال پیش
والد
کامیت
ac8283489d

+ 5 - 0
src/custom/restcontroller/R.java

@@ -5876,6 +5876,11 @@ public class R {
         }
     }
 
+    public static class ID20240328152502 {
+        public static class v1 {
+        }
+    }
+
 }
 
 

+ 28 - 0
src/custom/restcontroller/webmanage/adspace/adspace.java

@@ -122,5 +122,33 @@ public class adspace extends Controller {
         return getSucReturnObject().setData(rows).toString();
     }
 
+    @API(title = "广告位详细", apiversion = R.ID20240328152502.v1.class)
+    public String detail() throws YosException {
+
+        Long sys_adspaceid = content.getLongValue("sys_adspaceid");
+
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_adspace")
+                .setTableAlias("t1");
+        querySQL.setWhere("sys_adspaceid", sys_adspaceid);
+        Rows rows = querySQL.query();
+
+        RowsMap countRowsMap = dbConnect.runSqlQuery("SELECT count(0) count,sys_adspaceid from sys_ad WHERE siteid='" + siteid + "' GROUP BY sys_adspaceid").toRowsMap("sys_adspaceid");
+        for (Row row : rows) {
+            row.putIfAbsent("createdate", "");
+            row.putIfAbsent("changedate", "");
+            Rows sysAdspaceRows = countRowsMap.getOrDefault(row.getString("sys_adspaceid"), new Rows());
+            if (sysAdspaceRows.isEmpty()) {
+                row.putIfAbsent("count", 0);
+            } else {
+                row.putIfAbsent("count", sysAdspaceRows.get(0).getLong("count"));
+            }
+
+        }
+
+
+        return getSucReturnObject().setData(rows.isNotEmpty() ? rows.get(0) : new Row()).toString();
+
+    }
+
 
 }

+ 15 - 3
src/custom/restcontroller/webmanage/saletool/courseware/coursewaretesthead.java

@@ -2,6 +2,7 @@ package restcontroller.webmanage.saletool.courseware;
 
 import beans.department.Department;
 import beans.salearea.SaleArea;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.JsonArray;
@@ -43,10 +44,21 @@ public class coursewaretesthead extends Controller {
 
         ArrayList<Long> sat_courseware_testlibraryids = new ArrayList<>();
 
-        //yonglai
-        int iscreate = content.getIntValue("iscreate", 0);
+        //前端需要的逻辑处理是否跳过下方的验证
+        boolean isJump = false;
+        for (Object object : sat_courseware_classids) {
+            if (object instanceof JSONArray) {
+                JSONArray jsonArray = (JSONArray) object;
+                for (Object o : jsonArray) {
+                    if (o.toString().contains("9999")) {
+                        isJump = true;
+                    }
+                }
+            }
+        }
+
 
-        if (testaddmode == 1 && iscreate == 0) {
+        if (testaddmode == 1 && !isJump) {
             if (num <= 0) {
                 return getErrReturnObject().setErrMsg("出题方式为系统随机时题目设置数量需大于0").toString();
             }