Merge remote-tracking branch 'origin/ywx' into wn

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

@@ -20,6 +20,8 @@ public class GuideVo {
 
     private Integer createtime;//创建时间
 
+    private Integer createid;//创建人id
+
     private String createname;//发布人姓名
 
     private Integer costtime;//用时

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

@@ -9,6 +9,7 @@
         <result column="createtime" property="createtime"></result>
         <result column="costtime" property="costtime"></result>
         <result column="subjectname" property="subjectname"></result>
+        <result column="createid" property="createid"></result>
         <collection property="resources" ofType="java.util.Map"
                     javaType="java.util.List" select="listResourcesByGuideid" column="{guideid=guideid}">
         </collection>
@@ -16,7 +17,7 @@
 
     <!--学生预习列表教师网页端-->
     <select id="listGuidesForTeacherWeb" resultMap="guidesForMap">
-        select distinct g.guideid,g.guidename,g.createtime,g.schoolid
+        select distinct g.guideid,g.guidename,g.createtime,g.schoolid,g.createid
         ,(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
@@ -130,7 +131,7 @@
 
     <!--根据预习id获取预习详情-->
     <select id="getGuideByGuideid" resultMap="guidesForMap">
-      select g.guideid,g.guidename,g.createtime,g.schoolid,u.username as createname
+      select g.guideid,g.guidename,g.createtime,g.schoolid,g.createid,u.username as createname
         from t_guide g
         left join t_user u on g.createid=u.userid
         where g.guideid=#{guideid}
@@ -185,7 +186,7 @@
     </select>
     <!--获取年级下教师发布学生预习列表-->
     <select id="listPreview" resultMap="guidesForMap">
-        select g.guideid,g.guidename,g.createtime,g.schoolid,count(distinct gr.grid)as filenum
+        select g.guideid,g.guidename,g.createtime,g.schoolid,g.createid,count(distinct gr.grid)as filenum
         ,(select u.username from t_user u where u.userid=g.createid)createname
         from t_guide g
         left join t_guide_group gg on gg.guideid=g.guideid