预习教研

sapi/src/main/java/com/xhkjedu/sapi/vo/research/ResearchUserVo.java

@@ -2,6 +2,10 @@ package com.xhkjedu.sapi.vo.research;
 
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @ClassName ResearchUserVo
  * Description TODO
@@ -50,4 +54,10 @@ public class ResearchUserVo {
 
     //mp4文件编码：mpeg4网页端不能播放，h264网页端能播放
     private String mp4code;
+
+    //是否公开0公开1不公开
+    private Integer publiced;
+
+    //其他用户评价
+    private List<Map> others = new ArrayList<>();
 }

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

@@ -32,7 +32,7 @@
     <!-- 教师参与教研列表 -->
     <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,r.publiced,ru.rustate,ru.schoolid
+        r.createid,r.createtime,u.username AS createname,r.readnum,r.researchpath,r.publiced,r.schoolid,ru.rustate
         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}
@@ -51,7 +51,7 @@
     <!-- 根据id获取教研详细信息 -->
     <select id="getResearchUserDetail" resultType="com.xhkjedu.sapi.vo.research.ResearchUserVo">
          SELECT r.researchid,r.researchname,r.researchcontent,r.researchpath,r.researchcover,r.duration,r.filesize,
-        r.starttime,r.stoptime,r.readnum,r.mp4code,ru.rustate,ru.content,ru.reviewtime
+        r.starttime,r.stoptime,r.readnum,r.mp4code,r.publiced,ru.rustate,ru.content,ru.reviewtime
 	 FROM t_research_user ru LEFT JOIN t_research r ON ru.researchid=r.researchid
         WHERE r.researchid=#{researchid} AND ru.userid=#{userid} limit 1
     </select>

sstudy/src/main/java/com/xhkjedu/sstudy/vo/paper/PaperListVo.java

@@ -74,4 +74,7 @@ public class PaperListVo {
     private Integer hasreport;
 
     private Integer timetype;
+
+    //是否有伙伴学校：0没有1有
+    private Integer hashb;
 }

sstudy/src/main/java/com/xhkjedu/sstudy/vo/resource/GuideVo.java

@@ -32,8 +32,9 @@ public class GuideVo {
 
     private Integer schoolid;//学校id
 
-    private List<Map> resources = new ArrayList<>();//包含的资源
-
+    //是否有伙伴学校：0没有1有
+    private Integer hashb;
 
+    private List<Map> resources = new ArrayList<>();//包含的资源
 
 }

sstudy/src/main/resources/mapper/paper/PaperMapper.xml

@@ -80,6 +80,7 @@
         <result property="classnum" column="classnum"/>
         <result property="ytjnum" column="ytjnum"/>
         <result property="ypgnum" column="ypgnum"/>
+        <result property="hashb" column="hashb"/>
         <collection property="schools" ofType="java.util.Map" javaType="java.util.List"
                     select="listClass" column="{paperid=paperid,createid=createid,checkid=checkid,checktype=checktype,logschoolid=logschoolid,classids=classids}">
         </collection>
@@ -192,7 +193,7 @@
 
     <!--教师作业列表-->
     <select id="listAll" resultMap="paperResult">
-        select p.paperid,p.papername,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createtime,p.schoolid,p.hasreport,p.timetype,
+        select p.paperid,p.papername,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createtime,p.schoolid,p.hasreport,p.timetype,p.hashb,
         #{paper.schoolid} logschoolid,u.username createname,pg.starttime,pg.stoptime,pg.showtype,p.papernum,p.createid,#{paper.createid} as checkid
         ,group_concat(pg.classid) classids
         from t_paper p left join t_user u on p.createid=u.userid

sstudy/src/main/resources/mapper/resource/GuideMapper.xml

@@ -10,6 +10,7 @@
         <result column="costtime" property="costtime"/>
         <result column="subjectname" property="subjectname"/>
         <result column="createid" property="createid"/>
+        <result column="hashb" property="hashb"/>
         <collection property="resources" ofType="java.util.Map"
                     javaType="java.util.List" select="listResourcesByGuideid" column="{guideid=guideid}">
         </collection>
@@ -17,7 +18,7 @@
 
     <!--学生预习列表教师网页端-->
     <select id="listGuidesForTeacherWeb" resultMap="guidesForMap">
-        select distinct g.guideid,g.guidename,g.createtime,g.schoolid,g.createid
+        select distinct g.guideid,g.guidename,g.createtime,g.schoolid,g.createid,g.hashb
         ,(select u.username from t_user u where g.createid=u.userid)createname
         from t_guide g left join t_guide_resource gr on g.guideid=gr.guideid
         left join t_guide_group gg on g.guideid = gg.guideid