|
@@ -172,6 +172,9 @@ public class Fad extends Controller {
|
|
|
detailRow.put("classnames",getClassnames(detailRow.getJSONArray("sa_fadclassids")));
|
|
|
|
|
|
|
|
|
+ detailRow.put("mainclassnames",getMainClassnames(detailRow.getJSONArray("sa_fadclassids")));
|
|
|
+
|
|
|
+
|
|
|
return getSucReturnObject().setData(detailRow).toString();
|
|
|
}
|
|
|
|
|
@@ -457,6 +460,25 @@ public class Fad extends Controller {
|
|
|
}
|
|
|
|
|
|
|
|
|
+ return String.join(";", classnames);
|
|
|
+ }
|
|
|
+
|
|
|
+ public String getMainClassnames( JSONArray sa_fadclassids) throws YosException {
|
|
|
+ //[[1,2,3,6],[1,2]]
|
|
|
+ RowsMap rowsMap = dbConnect.runSqlQuery("SELECT sa_fadclassid,classname from sa_fadclass WHERE siteid='" + siteid + "'").toRowsMap("sa_fadclassid");
|
|
|
+ LinkedHashSet<String> classnames = new LinkedHashSet<>();
|
|
|
+ for (Object object : sa_fadclassids) {
|
|
|
+ ArrayList<String> temp = new ArrayList<>();
|
|
|
+ if (object instanceof JSONArray) {
|
|
|
+ JSONArray array = (JSONArray) object;
|
|
|
+ for (Object obj : array) {
|
|
|
+ temp.add(rowsMap.get(obj.toString()).get(0).getString("classname"));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ classnames.add(temp.get(0));
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
return String.join(";", classnames);
|
|
|
}
|
|
|
|