From 3ec7f587b3aaf185071ad08c15d94a472b347add Mon Sep 17 00:00:00 2001
From: zhaolongfei <2651195677@qq.com>
Date: Fri, 26 Jul 2024 21:36:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../study/service/impl/StudyServiceImpl.java      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
index 3afdf805..d3804e63 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
@@ -208,6 +208,7 @@ public class StudyServiceImpl implements IStudyService{
 				log.info("资源完成情况未开始sql"+sql);
 				List<Object[]> list = scDao.sqlFindList(sql);
 				log.info("资源完成情况人数"+list);
+				int totalCount = scDao.count(sql2);
 				List<StudyCourseItem> item = new ArrayList<>();
 				for (Object[] objs : list) {
 					StudyCourseItem sc = new StudyCourseItem();
@@ -218,7 +219,7 @@ public class StudyServiceImpl implements IStudyService{
 				}
 				log.info("资源完成情况人员"+item);
 				PageList<StudyCourseItem> pageList = new PageList<>(item);
-				pageList.setCount(Integer.parseInt(sql2));
+				pageList.setCount(totalCount);
 				pageList.setPageSize(pageSize);
 				pageList.setList(item);
 				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" +
 //				" )group by bsc.id) a group by a.id";
 		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 " +
 				"left join " +
 				"(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);
 		List<Object[]> list = scDao.sqlFindList(sql);
 		log.info("资源完成情况人数"+list);
+		int totalCount = scDao.count(sql2);
 		List<StudyCourseItem> item = new ArrayList<>();
 		for (Object[] objs : list) {
 			StudyCourseItem sc = new StudyCourseItem();
-			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-			LocalDateTime finishTime = LocalDateTime.parse(objs[4].toString(), formatter);
-			sc.setFinishTime(finishTime);
+			if (!"0".equals(objs[4].toString())) {
+				LocalDateTime finishTime = LocalDateTime.parse(objs[4].toString());
+				sc.setFinishTime(finishTime);
+			}
 			sc.setProgress(Integer.valueOf(objs[5].toString()));
 			sc.setStatus(Integer.valueOf(objs[6].toString()));
 			sc.setAname(objs[3].toString());
@@ -281,7 +284,7 @@ public class StudyServiceImpl implements IStudyService{
 		}
 		log.info("资源完成情况人员"+item);
 		PageList<StudyCourseItem> pageList = new PageList<>(item);
-		pageList.setCount(Integer.parseInt(sql2));
+		pageList.setCount(totalCount);
 		pageList.setPageSize(pageSize);
 		pageList.setList(item);
 		return pageList;