mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-25 02:32:57 +08:00
fix: 【FCJDFDXTXS-145】去掉group by
This commit is contained in:
@@ -49,7 +49,7 @@ public class StudyCourseItemDao extends BaseDao<StudyCourseItem> {
|
||||
// from及后面的语句
|
||||
appendFrom(builder, userIds, status);
|
||||
Query query = entityManager.createNativeQuery(builder.toString());
|
||||
setQueryParam(query, courseId, contentId, userIds, status, pageQuery, pageIndex, pageSize);
|
||||
setQueryParam(query, courseId, contentId, userIds, pageQuery, pageIndex, pageSize);
|
||||
|
||||
List<Object[]> resultList = query.getResultList();
|
||||
List<StudyCourseItem> itemList = new ArrayList<>();
|
||||
@@ -98,7 +98,7 @@ public class StudyCourseItemDao extends BaseDao<StudyCourseItem> {
|
||||
// from及后面的语句
|
||||
appendFrom(builder, userIds, status);
|
||||
Query query = entityManager.createNativeQuery(builder.toString());
|
||||
setQueryParam(query, courseId, contentId, userIds, status, false, 0, 0);
|
||||
setQueryParam(query, courseId, contentId, userIds, false, 0, 0);
|
||||
Number count = (Number) query.getSingleResult();
|
||||
return count.longValue();
|
||||
}
|
||||
@@ -134,24 +134,18 @@ public class StudyCourseItemDao extends BaseDao<StudyCourseItem> {
|
||||
break;
|
||||
}
|
||||
}
|
||||
// group by
|
||||
builder.append(System.lineSeparator());
|
||||
builder.append("GROUP BY bsc.id");
|
||||
// 排序
|
||||
builder.append(System.lineSeparator());
|
||||
builder.append("ORDER BY bsc.id DESC");
|
||||
}
|
||||
|
||||
private void setQueryParam(Query query, String courseId, String contentId, List<String> userIds, Integer status,
|
||||
private void setQueryParam(Query query, String courseId, String contentId, List<String> userIds,
|
||||
boolean pageQuery, int pageIndex, int pageSize) {
|
||||
query.setParameter("courseId", courseId);
|
||||
query.setParameter("contentId", contentId);
|
||||
if (userIds != null && !userIds.isEmpty()) {
|
||||
query.setParameter("userIds", userIds);
|
||||
}
|
||||
if (status != null) {
|
||||
query.setParameter("status", status);
|
||||
}
|
||||
if (pageQuery) {
|
||||
// 设置OFFSET和LIMIT
|
||||
query.setFirstResult((pageIndex - 1) * pageSize);
|
||||
|
||||
Reference in New Issue
Block a user