hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-11 03:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zcwy0716-llf' into master-0705

Browse Source
This commit is contained in:
nisen
2024-07-26 21:38:42 +08:00
parent b6378b6565 3ec7f587b3
commit 6521464676
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
View File

@@ -208,6 +208,7 @@ public class StudyServiceImpl implements IStudyService{
log.info("资源完成情况未开始sql"+sql); log.info("资源完成情况未开始sql"+sql);
List<Object[]> list = scDao.sqlFindList(sql); List<Object[]> list = scDao.sqlFindList(sql);
log.info("资源完成情况人数"+list); log.info("资源完成情况人数"+list);
int totalCount = scDao.count(sql2);
List<StudyCourseItem> item = new ArrayList<>(); List<StudyCourseItem> item = new ArrayList<>();
for (Object[] objs : list) { for (Object[] objs : list) {
StudyCourseItem sc = new StudyCourseItem(); StudyCourseItem sc = new StudyCourseItem();
@@ -218,7 +219,7 @@ public class StudyServiceImpl implements IStudyService{
} }
log.info("资源完成情况人员"+item); log.info("资源完成情况人员"+item);
PageList<StudyCourseItem> pageList = new PageList<>(item); PageList<StudyCourseItem> pageList = new PageList<>(item);
pageList.setCount(Integer.parseInt(sql2)); pageList.setCount(totalCount);
pageList.setPageSize(pageSize); pageList.setPageSize(pageSize);
pageList.setList(item); pageList.setList(item);
return pageList; return pageList;
@@ -248,7 +249,7 @@ public class StudyServiceImpl implements IStudyService{
// " where bsc.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' group by bsc.id" + // " where bsc.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' group by bsc.id" +
// " )group by bsc.id) a group by a.id"; // " )group by bsc.id) a group by a.id";
String sql = "select a.id, a.course_id, a.course_name, a.aname, " + String sql = "select a.id, a.course_id, a.course_name, a.aname, " +
"IFNULL(b.finish_time, 0) as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status " + "IFNULL(b.finish_time, null) as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status " +
"from (select id, course_id, course_name, aname, 0, 1 from boe_study_course where course_id = '" + courseId + "') a " + "from (select id, course_id, course_name, aname, 0, 1 from boe_study_course where course_id = '" + courseId + "') a " +
"left join " + "left join " +
"(select bsc.id, bsc.course_id, bsc.course_name, bsc.aname, item.finish_time, item.progress, item.status " + "(select bsc.id, bsc.course_id, bsc.course_name, bsc.aname, item.finish_time, item.progress, item.status " +
@@ -268,12 +269,14 @@ public class StudyServiceImpl implements IStudyService{
log.info("资源完成情况全部sql"+sql); log.info("资源完成情况全部sql"+sql);
List<Object[]> list = scDao.sqlFindList(sql); List<Object[]> list = scDao.sqlFindList(sql);
log.info("资源完成情况人数"+list); log.info("资源完成情况人数"+list);
int totalCount = scDao.count(sql2);
List<StudyCourseItem> item = new ArrayList<>(); List<StudyCourseItem> item = new ArrayList<>();
for (Object[] objs : list) { for (Object[] objs : list) {
StudyCourseItem sc = new StudyCourseItem(); StudyCourseItem sc = new StudyCourseItem();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); if (!"0".equals(objs[4].toString())) {
LocalDateTime finishTime = LocalDateTime.parse(objs[4].toString(), formatter); LocalDateTime finishTime = LocalDateTime.parse(objs[4].toString());
sc.setFinishTime(finishTime); sc.setFinishTime(finishTime);
}
sc.setProgress(Integer.valueOf(objs[5].toString())); sc.setProgress(Integer.valueOf(objs[5].toString()));
sc.setStatus(Integer.valueOf(objs[6].toString())); sc.setStatus(Integer.valueOf(objs[6].toString()));
sc.setAname(objs[3].toString()); sc.setAname(objs[3].toString());
@@ -281,7 +284,7 @@ public class StudyServiceImpl implements IStudyService{
} }
log.info("资源完成情况人员"+item); log.info("资源完成情况人员"+item);
PageList<StudyCourseItem> pageList = new PageList<>(item); PageList<StudyCourseItem> pageList = new PageList<>(item);
pageList.setCount(Integer.parseInt(sql2)); pageList.setCount(totalCount);
pageList.setPageSize(pageSize); pageList.setPageSize(pageSize);
pageList.setList(item); pageList.setList(item);
return pageList; return pageList;