|
|
@@ -119,23 +119,14 @@ public class coursewaredetail extends Controller {
|
|
|
querySQL.setUniqueid(sat_coursewaredetailid);
|
|
|
Rows rows = querySQL.query();
|
|
|
|
|
|
- ArrayList<Long> ids = rows.toArrayList("sat_coursewareid", new ArrayList<>());
|
|
|
- //封面cover
|
|
|
- RowsMap coverRowsMap = getAttachmentUrl("sat_courseware", ids, "cover");
|
|
|
+ ArrayList<Long> ids = rows.toArrayList("sat_coursewaredetailid", new ArrayList<>());
|
|
|
//附件
|
|
|
- RowsMap attRowsMap = getAttachmentUrl("sat_courseware", ids, "default");
|
|
|
+ RowsMap attRowsMap = getAttachmentUrl("sat_coursewaredetail", ids, "default");
|
|
|
|
|
|
Row detailRow = new Row();
|
|
|
if (rows.isNotEmpty()) {
|
|
|
detailRow = rows.get(0);
|
|
|
- Rows coverRows = coverRowsMap.get(detailRow.getString("sat_coursewareid"));
|
|
|
- if (coverRows.isEmpty()) {
|
|
|
- detailRow.put("cover", "");
|
|
|
- } else {
|
|
|
- detailRow.put("cover", coverRows.get(0).getString("url"));
|
|
|
- }
|
|
|
-
|
|
|
- detailRow.put("attinfos", attRowsMap.getOrDefault(detailRow.getString("sat_coursewareid"), new Rows()));
|
|
|
+ detailRow.put("attinfos", attRowsMap.getOrDefault(detailRow.getString("sat_coursewaredetailid"), new Rows()));
|
|
|
}
|
|
|
|
|
|
Long sat_coursewareid = detailRow.getLong("sat_coursewareid");
|
|
|
@@ -190,16 +181,17 @@ public class coursewaredetail extends Controller {
|
|
|
readSql.setWhere("sat_coursewaredetailid", ids);
|
|
|
readSql.addGroupBy("sat_coursewaredetailid");
|
|
|
RowsMap coursewareRowsMap = readSql.query().toRowsMap("sat_coursewaredetailid");
|
|
|
+ //附件
|
|
|
+ RowsMap attRowsMap = getAttachmentUrl("sat_coursewaredetail", ids, "default");
|
|
|
|
|
|
- for (Row row : rows
|
|
|
- ) {
|
|
|
+ for (Row row : rows) {
|
|
|
Rows coursewareRows = coursewareRowsMap.get(row.getString("sat_coursewaredetailid"));
|
|
|
if (coursewareRows.isEmpty()) {
|
|
|
row.put("user_count", 0);
|
|
|
} else {
|
|
|
row.put("user_count", coursewareRows.get(0).getString("user_count"));
|
|
|
}
|
|
|
-
|
|
|
+ row.put("attinfos", attRowsMap.getOrDefault(row.getString("sat_coursewaredetailid"), new Rows()));
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -277,15 +269,13 @@ public class coursewaredetail extends Controller {
|
|
|
pageSorting = "t1.sequence";
|
|
|
}
|
|
|
QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sat_courseware"
|
|
|
- ,"sat_coursewareid","title","status");
|
|
|
+ , "sat_coursewareid", "title", "status");
|
|
|
querySQL.setTableAlias("t1").setPage(pageSize, pageNumber).setOrderBy(pageSorting);
|
|
|
querySQL.setWhere("status", "发布");
|
|
|
querySQL.setWhere(where.toString());
|
|
|
Rows rows = querySQL.query();
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
return getSucReturnObject().setData(rows).toString();
|
|
|
}
|
|
|
|