From 885b203dd6b4fc1217d2b93ce844a666d93dcb79 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Fri, 26 Jul 2024 21:17:35 +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 | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 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 22cb9484..3afdf805 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 @@ -2,6 +2,7 @@ package com.xboe.school.study.service.impl; import java.math.BigInteger; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -198,12 +199,12 @@ public class StudyServiceImpl implements IStudyService{ " where item.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' group by item.study_id" + " ) group by bsc.id limit "+ pageIndex+","+ pageSize+";"; - String sql2 = "select count(*) from boe_study_course bsc " + + String sql2 = "select count(*) as total from (select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,item.content_id,0 as progress,1 as status from boe_study_course bsc " + " left join boe_study_course_item item on bsc.course_id = item.course_id and bsc.id = item.study_id" + " where bsc.course_id = '"+courseId+"' and bsc.id not in(" + " select item.study_id from boe_study_course_item item " + " where item.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' group by item.study_id" + - " ) group by bsc.id"; + " ) group by bsc.id) as total;"; log.info("资源完成情况未开始sql"+sql); List list = scDao.sqlFindList(sql); log.info("资源完成情况人数"+list); @@ -255,21 +256,24 @@ public class StudyServiceImpl implements IStudyService{ "where bsc.course_id = '" + courseId + "' and item.content_id = '" + contentId + "' group by bsc.id) b " + "on a.course_id = b.course_id and a.id = b.id " + "group by a.id"; - String sql2 = "select count(*) " + + String sql2 = "select count(*) as total from (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 " + "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 " + "from boe_study_course bsc left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " + "where bsc.course_id = '" + courseId + "' and item.content_id = '" + contentId + "' group by bsc.id) b " + "on a.course_id = b.course_id and a.id = b.id " + - "group by a.id"; + "group by a.id) as total"; log.info("资源完成情况全部sql"+sql); List list = scDao.sqlFindList(sql); log.info("资源完成情况人数"+list); List item = new ArrayList<>(); for (Object[] objs : list) { StudyCourseItem sc = new StudyCourseItem(); - sc.setFinishTime(LocalDateTime.parse(objs[4].toString())); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + LocalDateTime finishTime = LocalDateTime.parse(objs[4].toString(), formatter); + sc.setFinishTime(finishTime); sc.setProgress(Integer.valueOf(objs[5].toString())); sc.setStatus(Integer.valueOf(objs[6].toString())); sc.setAname(objs[3].toString());