批注接口提交

src/main/java/com/ssj/api/controller/ApiHomeworkController.java

@@ -1,7 +1,6 @@
 package com.ssj.api.controller;
 
-import com.ssj.api.domain.vo.homework.HomeworkReq;
-import com.ssj.api.domain.vo.homework.HomeworkTeacher;
+import com.ssj.api.domain.vo.homework.*;
 import com.ssj.api.domain.vo.teacher.HomeworkAllotReq;
 import com.ssj.api.domain.vo.teacher.TeacherAllotReq;
 import com.ssj.bean.sys.homework.domain.Homework;
@@ -12,6 +11,7 @@ import com.ssj.service.sys.homework.service.HomeworkPictureService;
 import com.ssj.service.sys.homework.service.HomeworkService;
 import com.ssj.service.weixin.library.service.IBookManagerService;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
@@ -44,23 +44,24 @@ public class ApiHomeworkController extends BaseController {
     @ApiOperation(value = "作业管理列表",  notes = "作业管理列表")
     public ResponseEntity list(@RequestParam(name = "accessToken") String accessToken, @RequestBody HomeworkReq req) {
         ResponseEntity responseEntity = new ResponseEntity();
-        Map<String,Object> data=new HashMap<>(2);
         Map<String,Object> params=new HashMap<>(2);
         try {
+            HomeworkListBaseVO vo = new HomeworkListBaseVO();
             //查询头信息
             Map<String,Object> headMap = managerService.findHeadInfo();
-            data.putAll(headMap);
-            data.put("waitAllocatedNums",homeworkPictureService.findNotAllotHomework());
+            vo.setOfflineNums(MapUtils.getInteger(headMap,"offline_nums"));
+            vo.setOnlineNums(MapUtils.getInteger(headMap,"online_nums"));
+            vo.setWaitAllocatedNums(Integer.parseInt(Long.toString(homeworkPictureService.findNotAllotHomework())));
             params.put("type",30);
             params.put("name",req.getTeacherName());
             /**
              *  is_mark=15 重复作业，11改成15
              *  is_mark=10不批注
              */
-            Page<Map<String,Object>> list = managerService.findTeacherHomeworkList(params,initPage(req.getPageNo(),req.getPageSize()));
-            data.put("list",list.getContent());
-            data.put("totalNums",list.getTotalElements());
-            responseEntity.success(data,"获取平台批改老师列表成功！");
+            Page<HomeworkListVO> list = managerService.findTeacherHomeworkList(params,initPage(req.getPageNo(),req.getPageSize()));
+            vo.setList(list.getContent());
+            vo.setTotalNums(Integer.parseInt(Long.toString(list.getTotalElements())));
+            responseEntity.success(vo,"获取平台批改老师列表成功！");
         } catch (Exception e) {
             logger.error("获取平台批改老师列表接口", e);
             responseEntity.failure(ResponseConstant.CODE_500, "系统繁忙，请稍后重试");
@@ -73,7 +74,7 @@ public class ApiHomeworkController extends BaseController {
         ResponseEntity responseEntity = new ResponseEntity();
         Map<String,Object> data=new HashMap<>(2);
         try {
-            List<Map<String,Object>> list = homeworkPictureService.teacherStudentList(req.getTeacherId());
+            List<StudentListVO> list = homeworkPictureService.teacherStudentList(req.getTeacherId());
             data.put("list",list);
             responseEntity.success(data,"获取平台批改老师列表成功！");
         } catch (Exception e) {
@@ -110,8 +111,8 @@ public class ApiHomeworkController extends BaseController {
             params.put("subject",req.getSubject());
             params.put("teacherId",req.getTeacherId());
             params.put("teacherName",req.getTeacherName());
-            Page<Map<String,Object>> list = homeworkPictureService.teacherList(params,initPage(req.getPageNo(),req.getPageSize()));
-            data.put("list",list);
+            Page<TeacherListVO> list = homeworkPictureService.teacherList(params,initPage(req.getPageNo(),req.getPageSize()));
+            data.put("list",list.getContent());
             responseEntity.success(data,"获取分配老师列表成功！");
         } catch (Exception e) {
             logger.error("获取分配老师列表异常", e);

src/main/java/com/ssj/api/domain/vo/homework/HomeworkListBaseVO.java

@@ -0,0 +1,63 @@
+package com.ssj.api.domain.vo.homework;
+
+import java.util.List;
+
+/**
+ * @author sh
+ * @className homeworkListVO
+ * @description vo
+ * @date 2021/3/3
+ */
+public class HomeworkListBaseVO {
+    /**
+     *onlineNums	int	data	在线人数
+     * offlineNums	int	data	离线人数
+     * waitAllocatedNums
+     */
+    private Integer onlineNums;
+    private Integer offlineNums;
+    private Integer waitAllocatedNums;
+    private Integer totalNums;
+
+    private List<HomeworkListVO> list;
+
+    public Integer getOnlineNums() {
+        return onlineNums;
+    }
+
+    public void setOnlineNums(Integer onlineNums) {
+        this.onlineNums = onlineNums;
+    }
+
+    public Integer getOfflineNums() {
+        return offlineNums;
+    }
+
+    public void setOfflineNums(Integer offlineNums) {
+        this.offlineNums = offlineNums;
+    }
+
+    public Integer getWaitAllocatedNums() {
+        return waitAllocatedNums;
+    }
+
+    public void setWaitAllocatedNums(Integer waitAllocatedNums) {
+        this.waitAllocatedNums = waitAllocatedNums;
+    }
+
+    public List<HomeworkListVO> getList() {
+        return list;
+    }
+
+    public void setList(List<HomeworkListVO> list) {
+        this.list = list;
+    }
+
+    public Integer getTotalNums() {
+        return totalNums;
+    }
+
+    public void setTotalNums(Integer totalNums) {
+        this.totalNums = totalNums;
+    }
+}

src/main/java/com/ssj/api/domain/vo/homework/HomeworkListVO.java

@@ -0,0 +1,82 @@
+package com.ssj.api.domain.vo.homework;
+
+/**
+ * @author sh
+ * @className homeworkListVO
+ * @description vo
+ * @date 2021/3/3
+ */
+public class HomeworkListVO {
+    /**
+     *teacherId	string	list	老师id
+     * teacherName	string	list	老师姓名
+     * waitNums	int	list	等待作业份数
+     * waitMaxTime	string	list	作业最长等待时长
+     * todayCorrectTime	string	list	今日累计批注时间
+     * efficiency	string	list	响应速度
+     * state	int
+     */
+    private String teacherId;
+    private String teacherName;
+    private Integer waitNums;
+    private String waitMaxTime;
+    private String todayCorrectTime;
+    private String efficiency;
+    private Integer state;
+
+    public String getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(String teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public Integer getWaitNums() {
+        return waitNums;
+    }
+
+    public void setWaitNums(Integer waitNums) {
+        this.waitNums = waitNums;
+    }
+
+    public String getWaitMaxTime() {
+        return waitMaxTime;
+    }
+
+    public void setWaitMaxTime(String waitMaxTime) {
+        this.waitMaxTime = waitMaxTime;
+    }
+
+    public String getTodayCorrectTime() {
+        return todayCorrectTime;
+    }
+
+    public void setTodayCorrectTime(String todayCorrectTime) {
+        this.todayCorrectTime = todayCorrectTime;
+    }
+
+    public String getEfficiency() {
+        return efficiency;
+    }
+
+    public void setEfficiency(String efficiency) {
+        this.efficiency = efficiency;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+}

src/main/java/com/ssj/api/domain/vo/homework/StudentListVO.java

@@ -0,0 +1,92 @@
+package com.ssj.api.domain.vo.homework;
+
+/**
+ * @author sh
+ * @className StudentListVO
+ * @description vo
+ * @date 2021/3/3
+ */
+public class StudentListVO {
+    /**
+     * homeworkId	string	list	作业id
+     * studentName	string	list	学生姓名
+     * stateMsg	String	list	状态详细描述
+     * subject	string	list	科目
+     * grade	string	list	年级
+     * state	int	list	批改状态 1-未批注（超时）2-未批注（等待）3-批注中4-已批注(标红)5-已批注(正常)
+     * correctNums	int	list	已批注份数
+     * totalNums
+     */
+    private String homeworkId;
+    private String studentName;
+    private String stateMsg;
+    private String subject;
+    private String grade;
+    private Integer state;
+    private Integer correctNums;
+    private Integer totalNums;
+
+    public String getHomeworkId() {
+        return homeworkId;
+    }
+
+    public void setHomeworkId(String homeworkId) {
+        this.homeworkId = homeworkId;
+    }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+    public String getStateMsg() {
+        return stateMsg;
+    }
+
+    public void setStateMsg(String stateMsg) {
+        this.stateMsg = stateMsg;
+    }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public String getGrade() {
+        return grade;
+    }
+
+    public void setGrade(String grade) {
+        this.grade = grade;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Integer getCorrectNums() {
+        return correctNums;
+    }
+
+    public void setCorrectNums(Integer correctNums) {
+        this.correctNums = correctNums;
+    }
+
+    public Integer getTotalNums() {
+        return totalNums;
+    }
+
+    public void setTotalNums(Integer totalNums) {
+        this.totalNums = totalNums;
+    }
+}

src/main/java/com/ssj/api/domain/vo/homework/TeacherListVO.java

@@ -0,0 +1,52 @@
+package com.ssj.api.domain.vo.homework;
+
+/**
+ * @author sh
+ * @className TeacherListVO
+ * @description vo
+ * @date 2021/3/3
+ */
+public class TeacherListVO {
+    /**
+     * teacherId	string	list	老师id
+     * teacherName	string	list	老师姓名
+     * waitNums	int	list	等待作业份数
+     * state
+     */
+    private String teacherId;
+    private String teacherName;
+    private Integer waitNums;
+    private Integer state;
+
+    public String getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(String teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public Integer getWaitNums() {
+        return waitNums;
+    }
+
+    public void setWaitNums(Integer waitNums) {
+        this.waitNums = waitNums;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+}

src/main/java/com/ssj/dao/sys/homework/dao/HomeworkQueryDao.java

@@ -1,5 +1,7 @@
 package com.ssj.dao.sys.homework.dao;
 
+import com.ssj.api.domain.vo.homework.StudentListVO;
+import com.ssj.api.domain.vo.homework.TeacherListVO;
 import com.ssj.service.conch.conch.vo.HomeworkVO;
 import com.ssj.service.conch.student.dto.AppWrongTopicBookDto;
 import com.ssj.service.conch.student.dto.WrongTopicBookDto;
@@ -92,14 +94,14 @@ public interface HomeworkQueryDao {
      * @param initPage
      * @return
      */
-    Page<Map<String, Object>> teacherList(Map<String, Object> params, Pageable initPage);
+    Page<TeacherListVO> teacherList(Map<String, Object> params, Pageable initPage);
 
     /**
      * 查询老师名下批改学生作业情况
      * @param teacherId
      * @return
      */
-    List<Map<String, Object>> teacherStudentList(String teacherId,String beginTime);
+    List<StudentListVO> teacherStudentList(String teacherId, String beginTime);
 
     List<ExerciseQuestionDto> findQuestionByBookIdAndPage(String bookId, String unitId, String s, List resultList2, int bookYear);
 

src/main/java/com/ssj/dao/sys/homework/dao/impl/HomeworkQueryDaoImpl.java

@@ -1,5 +1,7 @@
 package com.ssj.dao.sys.homework.dao.impl;
 
+import com.ssj.api.domain.vo.homework.StudentListVO;
+import com.ssj.api.domain.vo.homework.TeacherListVO;
 import com.ssj.dao.sys.homework.dao.HomeworkQueryDao;
 import com.ssj.framework.core.persistence.PagingHibernateJdbcDao;
 import com.ssj.framework.core.util.StringUtil;
@@ -280,11 +282,11 @@ public class HomeworkQueryDaoImpl implements HomeworkQueryDao {
     }
 
     @Override
-    public Page<Map<String, Object>> teacherList(Map<String, Object> params, Pageable initPage) {
+    public Page<TeacherListVO> teacherList(Map<String, Object> params, Pageable initPage) {
         List<Object> paramList = new ArrayList<>();
         StringBuilder sql = new StringBuilder();
-        sql.append("SELECT t.name as teacherName,t.user_id as teacherId,t.is_online as state,  \n ");
-        sql.append("(select count(1) from scon_homework_picture a where a.teacher_id = t.user_id and a.is_feedback = 0) as waitNums  \n ");
+        sql.append("SELECT t.name as teacher_name,t.user_id as teacher_id,t.is_online as state,  \n ");
+        sql.append("(select count(1) from scon_homework_picture a where a.teacher_id = t.user_id and a.is_feedback = 0) as wait_nums  \n ");
         sql.append("from tb_lib_manager t  \n ");
         sql.append("where t.type=30 \n ");
         if(Objects.nonNull(params.get("subject")) && StringUtil.isEmpty(params.get("subject").toString())){
@@ -300,18 +302,18 @@ public class HomeworkQueryDaoImpl implements HomeworkQueryDao {
             paramList.add(params.get("teacherName"));
         }
         sql.append("order by t.is_online desc  \n ");
-        return dao.findPage(sql.toString(), paramList.toArray(),initPage);
+        return dao.findPage(sql.toString(), paramList.toArray(),initPage,TeacherListVO.class);
     }
 
     @Override
-    public List<Map<String, Object>> teacherStudentList(String teacherId,String beginTime) {
+    public List<StudentListVO> teacherStudentList(String teacherId, String beginTime) {
         StringBuilder selSQL = new StringBuilder();
         List<Object> queryParams = new ArrayList<Object>();
-        selSQL.append("SELECT b.homework_id as homeworkId,b.student_name as studentName,b.`subject`,b.grade,b.correctNums,b.totalNums ,\n");
+        selSQL.append("SELECT b.homework_id,b.student_name ,b.`subject`,b.grade,b.correctNums as correct_nums,b.totalNums as total_nums,\n");
         selSQL.append("case when state in (4,5) then concat(DATE_FORMAT(SEC_TO_TIME(b.next_1),'%i分%s秒'),'/张') \n");
         selSQL.append("when state = 3 then concat(DATE_FORMAT(SEC_TO_TIME(b.start_time),'%i:%s'),'开始批注')\n");
         selSQL.append("when state = 2 then concat('等待',DATE_FORMAT(SEC_TO_TIME(TIMESTAMPDIFF(SECOND,b.allot_time,NOW())),'%i:%s'))\n");
-        selSQL.append("else '作业已超时' end stateMsg,b.state \n");
+        selSQL.append("else '作业已超时' end state_msg,b.state \n");
         selSQL.append("from (\n");
         selSQL.append("SELECT a.homework_id,a.student_name,a.`subject`,a.grade,a.correctNums,a.totalNums, \n");
         selSQL.append("case when a.type = 1 and  a.correctNums = a.totalNums and a.next_1 <=120 then 5\n");
@@ -359,7 +361,7 @@ public class HomeworkQueryDaoImpl implements HomeworkQueryDao {
         selSQL.append("group by t.homework_id\n");
         selSQL.append(") a \n");
         selSQL.append(") b order by b.state asc \n");
-        return  dao.findMap(selSQL.toString(),queryParams.toArray());
+        return  dao.findList(selSQL.toString(),queryParams.toArray(),StudentListVO.class);
     }
 
     @Override

src/main/java/com/ssj/dao/weixin/library/dao/ILibJoinQueryDao.java

@@ -1,5 +1,6 @@
 package com.ssj.dao.weixin.library.dao;
 
+import com.ssj.api.domain.vo.homework.HomeworkListVO;
 import com.ssj.bean.weixin.libmy.domain.TbLibJoin;
 import com.ssj.bean.weixin.libmy.domain.TbLibManager;
 import com.ssj.bean.weixin.libmy.domain.TbLibSubscribe;
@@ -117,5 +118,5 @@ public interface ILibJoinQueryDao {
 	 * @param initPage
 	 * @return
 	 */
-	Page<Map<String, Object>> findTeacherHomeworkList(Map<String, Object> params, Pageable initPage);
+	Page<HomeworkListVO> findTeacherHomeworkList(Map<String, Object> params, Pageable initPage);
 }

src/main/java/com/ssj/dao/weixin/library/dao/impl/LibJoinQueryDaoImpl.java

@@ -1,6 +1,7 @@
 package com.ssj.dao.weixin.library.dao.impl;
 
 
+import com.ssj.api.domain.vo.homework.HomeworkListVO;
 import com.ssj.bean.weixin.libmy.domain.TbLibJoin;
 import com.ssj.bean.weixin.libmy.domain.TbLibManager;
 import com.ssj.bean.weixin.libmy.domain.TbLibSubscribe;
@@ -1294,7 +1295,7 @@ public class LibJoinQueryDaoImpl implements ILibJoinQueryDao{
 		StringBuilder selSQL = new StringBuilder();
 		List<Object> queryParams = new ArrayList<Object>();
 		Map<String, Object> map = new HashMap<String, Object>();
-		selSQL.append("select count(if(is_online=1,true,null)) AS onlineNums,count(if(is_online=0,true,null)) AS offlineNums from tb_lib_manager where type=30 and state= 1 ");
+		selSQL.append("select count(if(is_online=1,true,null)) AS online_nums,count(if(is_online=0,true,null)) AS offline_nums from tb_lib_manager where type=30 and state= 1 ");
 		List<Map<String, Object>> mapList= dao.findMap(selSQL.toString(), queryParams.toArray());
 		if(mapList != null && mapList.size()>0){
 			map = mapList.get(0);
@@ -1303,22 +1304,22 @@ public class LibJoinQueryDaoImpl implements ILibJoinQueryDao{
 	}
 
 	@Override
-	public Page<Map<String, Object>> findTeacherHomeworkList(Map<String, Object> params, Pageable initPage) {
+	public Page<HomeworkListVO> findTeacherHomeworkList(Map<String, Object> params, Pageable initPage) {
 		StringBuilder selSQL = new StringBuilder();
 		List<Object> queryParams = new ArrayList<Object>();
 		selSQL.append("SELECT * from ( SELECT  \n");
-		selSQL.append("(SELECT count(DISTINCT a.homework_id) from scon_homework_picture a where a.teacher_id = t.user_id and a.is_mark in (0,2) and a.is_feedback = 0) as waitNums, \n");
-		selSQL.append("(SELECT concat(SEC_TO_TIME(TIMESTAMPDIFF(SECOND,min(a.allot_time),NOW())),'')   from scon_homework_picture a where a.teacher_id = t.user_id and a.is_mark in (0,2) and a.is_feedback = 0) as waitMaxTime, \n");
-		selSQL.append("t.user_id as teacherId,t.name as teacherName, \n");
-		selSQL.append("(select concat(SEC_TO_TIME(sum(a.correction_time)),'') from scon_homework_picture a where a.teacher_id = t.user_id and a.is_mark in (0,2) and a.is_feedback=1 and t.create_time > ?) as todayCorrectTime, \n");
+		selSQL.append("(SELECT count(DISTINCT a.homework_id) from scon_homework_picture a where a.teacher_id = t.user_id and a.is_mark in (0,2) and a.is_feedback = 0) as wait_nums, \n");
+		selSQL.append("(SELECT ifnull(concat(SEC_TO_TIME(TIMESTAMPDIFF(SECOND,min(a.allot_time),NOW())),''),0)   from scon_homework_picture a where a.teacher_id = t.user_id and a.is_mark in (0,2) and a.is_feedback = 0) as wait_max_time, \n");
+		selSQL.append("t.user_id as teacher_id,t.name as teacher_name, \n");
+		selSQL.append("(select ifnull(concat(SEC_TO_TIME(sum(a.correction_time)),''),0) from scon_homework_picture a where a.teacher_id = t.user_id and a.is_mark in (0,2) and a.is_feedback=1 and t.create_time > ?) as today_correct_time, \n");
 		queryParams.add(params.get("beginTime"));
-		selSQL.append("(select concat(SEC_TO_TIME(floor(sum(TIMESTAMPDIFF(SECOND,a.allot_time,b.start_time))/count(1))),'') from scon_homework_picture a join scon_homework_picture_correct b on a.id = b.homework_picture_id and b.type=8 where a.teacher_id = t.user_id and a.is_mark in (0,2) and a.is_feedback=1 and t.create_time > ?) as efficiency, \n");
+		selSQL.append("(select ifnull(concat(SEC_TO_TIME(floor(sum(TIMESTAMPDIFF(SECOND,a.allot_time,b.start_time))/count(1))),''),0) from scon_homework_picture a join scon_homework_picture_correct b on a.id = b.homework_picture_id and b.type=8 where a.teacher_id = t.user_id and a.is_mark in (0,2) and a.is_feedback=1 and t.create_time > ?) as efficiency, \n");
 		queryParams.add(params.get("beginTime"));
 		selSQL.append("t.is_online as state  \n");
 		selSQL.append("from tb_lib_manager t  \n");
 		selSQL.append("where t.type=30 \n");
-		selSQL.append(") a order by a.state desc,a.waitNums desc  \n");
-		return  dao.findPage(selSQL.toString(), queryParams.toArray(),initPage);
+		selSQL.append(") a order by a.state desc,a.wait_nums desc  \n");
+		return  dao.findPage(selSQL.toString(), queryParams.toArray(),initPage,HomeworkListVO.class);
 	}
 
 

src/main/java/com/ssj/service/sys/homework/service/HomeworkPictureService.java

@@ -1,5 +1,7 @@
 package com.ssj.service.sys.homework.service;
 
+import com.ssj.api.domain.vo.homework.StudentListVO;
+import com.ssj.api.domain.vo.homework.TeacherListVO;
 import com.ssj.bean.sys.homework.domain.HomeworkPicture;
 
 import com.ssj.framework.core.common.service.BaseService;
@@ -50,7 +52,7 @@ public interface HomeworkPictureService extends BaseService<HomeworkPicture, Str
      * @param initPage
      * @return
      */
-    Page<Map<String, Object>> teacherList(Map<String, Object> params, Pageable initPage);
+    Page<TeacherListVO> teacherList(Map<String, Object> params, Pageable initPage);
 
     /**
      * 查询作业正在批改的数量
@@ -81,7 +83,7 @@ public interface HomeworkPictureService extends BaseService<HomeworkPicture, Str
      * @param teacherId
      * @return
      */
-    List<Map<String, Object>> teacherStudentList(String teacherId);
+    List<StudentListVO> teacherStudentList(String teacherId);
 
     Map<String, Object> pictureDetail(String pictureId);
 }

src/main/java/com/ssj/service/sys/homework/service/impl/HomeworkPictureServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ssj.service.sys.homework.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.ssj.api.domain.vo.homework.StudentListVO;
+import com.ssj.api.domain.vo.homework.TeacherListVO;
 import com.ssj.bean.kmt.kmt.domain.KmtHomeworkWrongQuestion;
 import com.ssj.bean.kmt.kmt.domain.QuestionRecommendRecord;
 import com.ssj.bean.sys.homework.domain.HomeworkPicture;
@@ -173,7 +175,7 @@ public class HomeworkPictureServiceImpl extends BaseServiceImpl<HomeworkPicture,
     }
 
     @Override
-    public Page<Map<String, Object>> teacherList(Map<String, Object> params, Pageable initPage) {
+    public Page<TeacherListVO> teacherList(Map<String, Object> params, Pageable initPage) {
         return queryDao.teacherList(params,initPage);
     }
 
@@ -214,7 +216,7 @@ public class HomeworkPictureServiceImpl extends BaseServiceImpl<HomeworkPicture,
     }
 
     @Override
-    public List<Map<String, Object>> teacherStudentList(String teacherId) {
+    public List<StudentListVO> teacherStudentList(String teacherId) {
         return queryDao.teacherStudentList(teacherId,getBeginTime());
     }
 

src/main/java/com/ssj/service/weixin/library/service/IBookManagerService.java

@@ -1,5 +1,6 @@
 package com.ssj.service.weixin.library.service;
 
+import com.ssj.api.domain.vo.homework.HomeworkListVO;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.weixin.libmy.domain.TbLibManager;
 import com.ssj.bean.weixin.user.domain.User;
@@ -551,5 +552,5 @@ public interface IBookManagerService extends BaseService<TbLibManager, String> {
 	 * @param initPage
 	 * @return
 	 */
-	Page<Map<String, Object>> findTeacherHomeworkList(Map<String, Object> params, Pageable initPage);
+	Page<HomeworkListVO> findTeacherHomeworkList(Map<String, Object> params, Pageable initPage);
 }

src/main/java/com/ssj/service/weixin/library/service/impl/BookManagerServiceImpl.java

@@ -3,6 +3,7 @@ package com.ssj.service.weixin.library.service.impl;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.google.common.primitives.Ints;
+import com.ssj.api.domain.vo.homework.HomeworkListVO;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.weixin.libmy.domain.TbLibManager;
 import com.ssj.bean.weixin.libmy.domain.TbLibManagerAudit;
@@ -1035,7 +1036,7 @@ public class BookManagerServiceImpl extends BaseServiceImpl<TbLibManager, String
     }
 
     @Override
-    public Page<Map<String, Object>> findTeacherHomeworkList(Map<String, Object> params, Pageable initPage) {
+    public Page<HomeworkListVO> findTeacherHomeworkList(Map<String, Object> params, Pageable initPage) {
         params.put("beginTime",getBeginTime());
         return libJoinQueryDao.findTeacherHomeworkList(params,initPage);
     }