教师教研相关、预习作业相关

sapi/src/main/java/com/xhkjedu/sapi/controller/research/ResearchUserController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName ResearchUserController
@@ -66,7 +67,7 @@ public class ResearchUserController {
                 researchUser.getPage(),"显示页码",1,researchUser.getPageSize(),"显示条数",1,
                 researchUser.getUserid(),"教师id",1,researchUser.getRorder(),"排序",2});
         PageHelper.startPage(researchUser.getPage(), researchUser.getPageSize());
-        List<ResearchVo> list = researchUserService.listUserResearchs(researchUser.getUserid(),researchUser.getRorder(),researchUser.getRustate());
+        List<Map> list = researchUserService.listUserResearchs(researchUser.getUserid(), researchUser.getRorder(), researchUser.getRustate());
         PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
         return new ResultVo(0,"获取教师教研列表成功",pageResult);
     }

sapi/src/main/java/com/xhkjedu/sapi/mapper/research/ResearchUserMapper.java

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName ResearchUserMapper
@@ -65,7 +66,7 @@ public interface ResearchUserMapper extends TkMapper<TResearchUser> {
      * @param timestamp
      * @return java.util.List<com.xhkjedu.vo.research.ResearchVo>
      */
-    List<ResearchVo> listUserResearchs(@Param("userid") Integer userid, @Param("rorder") String rorder
+    List<Map> listUserResearchs(@Param("userid") Integer userid, @Param("rorder") String rorder
             , @Param("rustate") Integer rustate, @Param("timestamp") int timestamp);
 
     /**

sapi/src/main/java/com/xhkjedu/sapi/service/research/ResearchUserService.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName ResearchUserService
@@ -46,7 +47,7 @@ public class ResearchUserService {
      * @param rorder
      * @return java.util.List<com.xhkjedu.vo.research.ResearchVo>
      */
-    public List<ResearchVo> listUserResearchs(Integer userid,String rorder,Integer rustate){
+    public List<Map> listUserResearchs(Integer userid, String rorder, Integer rustate){
         return researchUserMapper.listUserResearchs(userid,rorder,rustate,N_Utils.getSecondTimestamp());
     }
 

sapi/src/main/resources/mapper/research/ResearchUserMapper.xml

@@ -30,14 +30,14 @@
     </select>
 
     <!-- 教师参与教研列表 -->
-    <select id="listUserResearchs" resultType="com.xhkjedu.sapi.vo.research.ResearchVo">
+    <select id="listUserResearchs" resultType="java.util.Map">
          SELECT r.researchid,r.researchname,r.researchcover,r.duration,r.filesize,r.starttime,r.stoptime,r.mp4code,
-        r.createid,r.createtime,u.username AS createname,r.readnum,r.researchpath,ru.rustate
+        r.createid,r.createtime,u.username AS createname,r.readnum,r.researchpath,r.publiced,ru.rustate,ru.schoolid
         FROM t_research_user ru LEFT JOIN t_research r ON ru.researchid=r.researchid
         LEFT JOIN t_user u ON r.createid=u.userid
         WHERE ru.userid=#{userid} and r.starttime&lt;=#{timestamp}
         <if test="rustate!=null"> and ru.rustate=#{rustate}</if>
-        GROUP BY r.researchid ORDER BY ru.rustate
+        GROUP BY r.researchid ORDER BY ru.rustate,r.createtime desc
         <if test="rorder=='stoptime'">,r.stoptime DESC</if>
         <if test="rorder=='readnum'">,r.readnum DESC</if>
         <if test="rorder=='createtime'">,r.createtime DESC</if>