作业、预习、背诵获取教师权限班级完善

作业设置批阅方式完善

sstudy/src/main/java/com/xhkjedu/sstudy/controller/paper/PaperAnalyzeController.java

@@ -188,7 +188,8 @@ public class PaperAnalyzeController {
         Integer pageSize = paper.getPageSize();
         Integer teacherid = paper.getTeacherid();
         Integer gradeid = paper.getGradeid();
-        N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1,teacherid,"教师id",1,gradeid,"年级id",1});
+        N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1,teacherid,"教师id",1
+                ,gradeid,"年级id",1,paper.getCreateid(),"创建人id",1});
         //paperAnalyzeService.setYear(paper);
         paperAnalyzeService.setClassIds(paper);//设置教师权限班级
         PageHelper.startPage(page, pageSize);

sstudy/src/main/java/com/xhkjedu/sstudy/controller/paper/PaperController.java

@@ -206,7 +206,7 @@ public class PaperController {
         Integer pageSize = paper.getPageSize();
         N_Utils.validation(new Object[]{lsbid,"教材关联关系id",2,createid,"教师id",1,page,"显示页码",1,pageSize,"显示条数",1});
         //获取当前教师权限班级
-        Map classMap = classService.getQxClassidsByTeacherid(createid);
+        Map classMap = classService.getQxClassidsByTeacherid(createid, null);
         String bxclassids = classMap.get("bxclassids").toString();//本校权限班级
         paper.setBxclassids(bxclassids);
         paper.setClassids(classMap.get("classids").toString());
@@ -220,12 +220,7 @@ public class PaperController {
     @PostMapping("/set_checktype")
     public ResultVo setCheckType(@RequestBody PaperParam param) {
         N_Utils.validation(new Object[]{param.getPaperid(),"试卷id",1,param.getChecktype(),"批改方式",1});
-        try {
-            paperService.setCheckType(param);
-        } catch (Exception e) {
-            return new ResultVo(1, "设置失败");
-        }
-        return new ResultVo(0,"设置成功");
+        return paperService.setCheckType(param);
     }
 
     @PostMapping("/check_students")

sstudy/src/main/java/com/xhkjedu/sstudy/controller/paper/PaperTeaAppController.java

@@ -47,7 +47,7 @@ public class PaperTeaAppController {
         N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1
                 ,teacherid,"教师id",1,paperSearch.getSchoolid(),"学校id",1});
         //获取当前教师权限班级
-        Map classMap = paperTeaAppService.getQxClassidsByTeacherid(teacherid);
+        Map classMap = paperTeaAppService.getQxClassidsByTeacherid(teacherid, null);
         String bxclassids = classMap.get("bxclassids").toString();//本校权限班级
         paperSearch.setBxclassids(bxclassids);
         paperSearch.setClassids(classMap.get("classids").toString());

sstudy/src/main/java/com/xhkjedu/sstudy/controller/recite/ReciteController.java

@@ -111,7 +111,7 @@ public class ReciteController {
         N_Utils.validation(new Object[]{
                 recite.getPage(), "显示页码", 1, recite.getPageSize(), "显示条数", 1,
                 recite.getCreateid(), "创建人", 1,recite.getSchoolid(),"学校id",1});
-        Map classmap = classService.getQxClassidsByTeacherid(recite.getCreateid());
+        Map classmap = classService.getQxClassidsByTeacherid(recite.getCreateid(), null);
         recite.setClassids(classmap.get("classids").toString());
         recite.setBxclassids(classmap.get("bxclassids").toString());
         PageHelper.startPage(recite.getPage(), recite.getPageSize());
@@ -125,7 +125,7 @@ public class ReciteController {
     public ResultVo listClass(@RequestBody TRecite recite) {
         Integer reciteid = recite.getReciteid();
         N_Utils.validation(new Object[]{reciteid, "背诵id", 1,recite.getCreateid(),"教师id",1,recite.getSchoolid(),"学校id",1});
-        Map classmap = classService.getQxClassidsByTeacherid(recite.getCreateid());
+        Map classmap = classService.getQxClassidsByTeacherid(recite.getCreateid(), reciteService.getYearById(reciteid));
         recite.setClassids(classmap.get("classids").toString());
         recite.setBxclassids(classmap.get("bxclassids").toString());
         Map list = reciteService.listClass(recite);

sstudy/src/main/java/com/xhkjedu/sstudy/controller/resource/GuideController.java

@@ -47,7 +47,7 @@ public class GuideController {
         String subjectid = guide.getSubjectid();
         N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1,createid,"教师id",1
                 ,subjectid,"科目",2});
-        Map<String, String> map = classService.getQxClassidsByTeacherid(createid);
+        Map<String, String> map = classService.getQxClassidsByTeacherid(createid, null);
         guide.setClassids(map.get("classids"));
         guide.setBxclassids(map.get("bxclassids"));
         if (N_Utils.isEmpty(guide.getSchoolid())) {
@@ -67,7 +67,7 @@ public class GuideController {
         String subjectid = guide.getSubjectid();
         N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1,createid,"教师id",1
                 ,subjectid,"科目",2});
-        Map<String, String> map = classService.getQxClassidsByTeacherid(createid);
+        Map<String, String> map = classService.getQxClassidsByTeacherid(createid, null);
         guide.setClassids(map.get("classids"));
         guide.setBxclassids(map.get("bxclassids"));
         if (N_Utils.isEmpty(guide.getSchoolid())) {
@@ -88,7 +88,7 @@ public class GuideController {
         Integer guideid = guide.getGuideid();
         N_Utils.validation(new Object[]{guideid, "预习id", 1,guide.getCreateid(),"教师id",1
                 ,guide.getSchoolid(),"学校id",1});
-        Map<String, String> map = classService.getQxClassidsByTeacherid(guide.getCreateid());
+        Map<String, String> map = classService.getQxClassidsByTeacherid(guide.getCreateid(), guideService.getYearById(guideid));
         guide.setClassids(map.get("classids"));
         guide.setBxclassids(map.get("bxclassids"));
         Map list = guideService.listGuideClassByGuide(guide);
@@ -182,7 +182,8 @@ public class GuideController {
         Integer pageSize = paper.getPageSize();
         Integer teacherid = paper.getTeacherid();
         Integer gradeid = paper.getGradeid();
-        N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1,teacherid,"教师id",1,gradeid,"年级id",1});
+        N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1,teacherid,"教师id",1
+                ,gradeid,"年级id",1,paper.getCreateid(),"创建人id",1});
         //guideService.setYear(paper);
         guideService.setClassIds(paper);
         PageHelper.startPage(page, pageSize);

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/gradeclass/ClassMapper.java

@@ -28,5 +28,5 @@ public interface ClassMapper extends TkMapper<TClass> {
     List<Map> listByClassIds(@Param("classids") List<Integer> classids,@Param("paperid") Integer paperid);
 
     //获取教师权限下班级包含伙伴学校-
-    List<Map> listQxClassByTeacherid(@Param("teacherid") Integer teacherid);
+    List<Map> listQxClassByTeacherid(@Param("teacherid") Integer teacherid,@Param("year") Integer year);
 }

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/recite/ReciteMapper.java

@@ -44,4 +44,7 @@ public interface ReciteMapper extends TkMapper<TRecite> {
      * @Date 2022/6/21 10:36
      **/
     List<Map> listClass(@Param("recite") TRecite recite);
+
+    //获取背诵年份
+    Integer getYearById(@Param("reciteid") Integer reciteid);
 }

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/resource/GuideMapper.java

@@ -68,4 +68,6 @@ public interface GuideMapper extends TkMapper<TGuide> {
     //预习关联班级
     List<Map> listGuideClassByGuide(@Param("guide") TGuide guide);
 
+    //获取预习年份
+    Integer getYearById(@Param("guideid") Integer guideid);
 }

sstudy/src/main/java/com/xhkjedu/sstudy/service/gradeclass/ClassService.java

@@ -26,9 +26,9 @@ public class ClassService {
     * @Author WN
     * @Date 2023/4/12 14:31
     */
-    public Map getQxClassidsByTeacherid(Integer teacherid){
+    public Map getQxClassidsByTeacherid(Integer teacherid, Integer year){
         //获取教师权限下班级包含集团校
-        List<Map> classlist = classMapper.listQxClassByTeacherid(teacherid);
+        List<Map> classlist = classMapper.listQxClassByTeacherid(teacherid, year);
 
         //所有权限班级集合
         List<Integer> classidlist = classlist.stream().map(s -> Integer.parseInt(s.get("classid").toString())).collect(Collectors.toList());

sstudy/src/main/java/com/xhkjedu/sstudy/service/paper/PaperService.java

@@ -16,6 +16,7 @@ import com.xhkjedu.sstudy.vo.paperstudent.PaperSearchVo;
 import com.xhkjedu.sstudy.vo.question.QuestionVo;
 import com.xhkjedu.sstudy.vo.subjectbook.PointVo;
 import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -1053,7 +1054,7 @@ public class PaperService {
      * @return void
      **/
     @Transactional(rollbackFor = Exception.class)
-    public void setCheckType(PaperParam param) throws Exception {
+    public ResultVo setCheckType(PaperParam param) {
         Integer checktype = param.getChecktype();//批改方式1教师批改2学生互改3指定学生批改
         Integer paperid = param.getPaperid();//试卷ID
 
@@ -1062,6 +1063,8 @@ public class PaperService {
             if (checktype == 1){//教师批阅
                 if (N_Utils.isEmptyInteger(param.getTeacherid())) {//不同班级分别指定教师
                     List<PaperCheckParam> checkParams = JSON.parseArray(param.getClassids(), PaperCheckParam.class);
+                    long count = checkParams.stream().filter(c -> N_Utils.isEmptyInteger(c.getCheckid())).count();
+                    if (count != 0) return new ResultVo(1, "有班级未指定批阅人");
                     paperStudentMapper.updateCheckId2(paperid, checkParams);
                 } else {//不同班级指定同一个教师
                     paperStudentMapper.updateCheckId(paperid,param.getTeacherid());//设置批改人
@@ -1113,8 +1116,9 @@ public class PaperService {
         } catch (Exception e) {
             log.error("设置批改方式失败："+e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            throw new RuntimeException("设置批改方式失败");
+            return new ResultVo(1, "设置失败");
         }
+        return new ResultVo(0,"设置成功");
     }
 
     /**

sstudy/src/main/java/com/xhkjedu/sstudy/service/paper/PaperTeaAppService.java

@@ -36,8 +36,8 @@ public class PaperTeaAppService {
     @Resource
     private ClassService classService;
 
-    public Map<String, String> getQxClassidsByTeacherid(Integer teacherid) {
-        return classService.getQxClassidsByTeacherid(teacherid);
+    public Map<String, String> getQxClassidsByTeacherid(Integer teacherid, Integer year) {
+        return classService.getQxClassidsByTeacherid(teacherid, year);
     }
 
     //获取作业列表
@@ -70,7 +70,7 @@ public class PaperTeaAppService {
         Map map = new HashMap();
         TPaper paper = paperMapper.selectByPrimaryKey(paperid);
         Integer hashb = paper.getHashb();
-        Map<String, String> cmap = getQxClassidsByTeacherid(checkid);
+        Map<String, String> cmap = getQxClassidsByTeacherid(checkid, paper.getYear());
         String classids;
         if (checkid.equals(paper.getCreateid())) {//自己发布的看所有班级
             classids = null;

sstudy/src/main/java/com/xhkjedu/sstudy/service/recite/ReciteService.java

@@ -259,4 +259,9 @@ public class ReciteService {
 
         return rtnMap;
     }
+
+    //获取背诵年份
+    public Integer getYearById(Integer reciteid){
+        return reciteMapper.getYearById(reciteid);
+    }
 }

sstudy/src/main/java/com/xhkjedu/sstudy/service/recite/ReciteStudentService.java

@@ -87,9 +87,9 @@ public class ReciteStudentService {
         TRecite recite = null;
         if(N_Utils.isEmptyInteger(reciteStudent.getClassid())){
             //教师网页端获取所有
-            Map classidMap = classService.getQxClassidsByTeacherid(reciteStudent.getTeacherid());//教师权限班级
-            String classids = "";//教师本校和集团校权限班级
             recite = reciteMapper.selectByPrimaryKey(reciteStudent.getReciteid());
+            Map classidMap = classService.getQxClassidsByTeacherid(reciteStudent.getTeacherid(), recite.getYear());//教师权限班级
+            String classids = "";//教师本校和集团校权限班级
             if (reciteStudent.getTeacherid().equals(recite.getCreateid())) {//自己发布的看所有班级
                 classids = null;
             } else if(recite.getHashb() == 1 && recite.getSchoolid().equals(reciteStudent.getSchoolid())){

sstudy/src/main/java/com/xhkjedu/sstudy/service/resource/GuideGroupService.java

@@ -48,7 +48,7 @@ public class GuideGroupService {
             TGuide tGuide = guideMapper.selectByPrimaryKey(guide.getGuideid());
             Integer hashb = tGuide.getHashb();
             Integer schoolid = tGuide.getSchoolid();
-            Map<String, String> cmap = classService.getQxClassidsByTeacherid(guide.getCreateid());
+            Map<String, String> cmap = classService.getQxClassidsByTeacherid(guide.getCreateid(), tGuide.getYear());
             if (guide.getCreateid().equals(tGuide.getCreateid())) {//自己发布的看所有班级
                 guide.setClassids(null);
             } else if (hashb == 1 && guide.getSchoolid().equals(schoolid)) {//有伙伴学校并且是本校发的

sstudy/src/main/java/com/xhkjedu/sstudy/service/resource/GuideService.java

@@ -500,4 +500,9 @@ public class GuideService {
 
         return rtnMap;
     }
+
+    //获取预习年份
+    public Integer getYearById(Integer guideid){
+        return guideMapper.getYearById(guideid);
+    }
 }

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

@@ -41,4 +41,6 @@ public class AnalyzeSearchVo {
     private String classids;//班级ids
 
     private Integer timestamp;//当前时间戳
+
+    private Integer createid;//创建人id
 }

sstudy/src/main/resources/mapper/gradeclass/ClassMapper.xml

@@ -53,9 +53,11 @@
     <select id="listQxClassByTeacherid" resultType="java.util.Map">
         select c.classid,c.classname,u.schoolid userschoolid,ct.schoolid from t_class_teacher ct
         left join t_class c on ct.classid=c.classid
-        left join t_school s on c.schoolid=s.schoolid and c.`year`=s.`year`
+        left join t_school s on c.schoolid=s.schoolid
         left join t_user u on u.userid=ct.teacherid
         where ct.teacherid=#{teacherid} and c.classstate=1 and s.schoolstate=1 and c.classtype in (1,2,3)
+        <if test="year==null or year==0">and c.`year`=s.year</if>
+        <if test="year!=null and year!=0">and c.`year`=#{year}</if>
         order by s.createtime desc, c.classtype,c.classorder
     </select>
 </mapper>

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

@@ -304,7 +304,7 @@
         ,(select u.username from t_user u where u.userid=p.createid)createname
         from t_paper p left join t_paper_class pg on p.paperid=pg.paperid
         left join t_class c on pg.classid=c.classid
-        where p.createid=#{paper.teacherid} and c.gradeid=#{paper.gradeid} and c.year=#{paper.year}
+        where p.createid=#{paper.createid} and c.gradeid=#{paper.gradeid} and c.year=#{paper.year}
         and pg.schoolid=#{paper.schoolid}
         <if test="paper.starttime!=null and paper.starttime!=0">
             and pg.starttime>=#{paper.starttime}
@@ -438,7 +438,7 @@
         left join t_class c on ct.classid=c.classid
         left join t_paper_class pg on u.schoolid=pg.schoolid
         where tp.subjectid=#{param.subjectid} and u.userstate=1 and u.usertype=1 and pg.paperid=#{param.paperid}
-        and c.classstate=1 and c.year=#{param.year} and c.classtype in (1,2) and c.gradeid=#{param.gradeid}
+        and c.classstate!=10 and c.year=#{param.year} and c.classtype in (1,2) and c.gradeid=#{param.gradeid}
         group by ct.teacherid order by c.classtype,c.classorder, convert(u.username using gbk)
     </select>
     <resultMap id="paperStudentList" type="java.util.Map">

sstudy/src/main/resources/mapper/recite/ReciteMapper.xml

@@ -9,7 +9,7 @@
     <!--获取背诵班级-->
     <select id="listClass" resultType="java.util.Map">
         select rs.classid,c.classname,c.gradeid,s.schoolid,s.schoolname,count(distinct rs.rsid)stunum
-        ,count(distinct case when rs.rsstate>0 then rs.rsid else null end)commitnum
+        ,count(distinct if(rs.rsstate>0, rs.rsid, null))commitnum
         from t_recite_student rs left join t_class c on rs.classid = c.classid
         left join t_school s on rs.schoolid=s.schoolid
         left join t_recite r on rs.reciteid=r.reciteid
@@ -24,24 +24,24 @@
 
     <!-- 背诵分页列表 网页 -->
     <resultMap id="listRecitesMap" type="java.util.Map">
-        <result property="reciteid" column="reciteid"></result>
-        <result property="recitetitle" column="recitetitle"></result>
-        <result property="recitecont" column="recitecont"></result>
-        <result property="schoolid" column="schoolid"></result>
-        <result property="subjectname" column="subjectname"></result>
-        <result property="createid" column="createid"></result>
-        <result property="createname" column="createname"></result>
-        <result property="createtime" column="createtime"></result>
-        <result property="starttime" column="starttime"></result>
-        <result property="stoptime" column="stoptime"></result>
-        <result property="hashb" column="hashb"></result>
+        <result property="reciteid" column="reciteid"/>
+        <result property="recitetitle" column="recitetitle"/>
+        <result property="recitecont" column="recitecont"/>
+        <result property="schoolid" column="schoolid"/>
+        <result property="subjectname" column="subjectname"/>
+        <result property="createid" column="createid"/>
+        <result property="createname" column="createname"/>
+        <result property="createtime" column="createtime"/>
+        <result property="starttime" column="starttime"/>
+        <result property="stoptime" column="stoptime"/>
+        <result property="hashb" column="hashb"/>
         <collection property="reciteStus" ofType="java.util.Map" select="listReciteStu"
                     javaType="java.util.List" column="reciteid">
-            <result property="rsid" column="rsid"></result>
-            <result property="classid" column="classid"></result>
-            <result property="studentid" column="studentid"></result>
-            <result property="studentid" column="studentid"></result>
-            <result property="schoolid" column="schoolid"></result>
+            <result property="rsid" column="rsid"/>
+            <result property="classid" column="classid"/>
+            <result property="studentid" column="studentid"/>
+            <result property="studentid" column="studentid"/>
+            <result property="schoolid" column="schoolid"/>
         </collection>
     </resultMap>
     <select id="listRecites" resultMap="listRecitesMap">
@@ -50,23 +50,26 @@
         ,r.createid,u.username AS createname,r.createtime,rg.starttime,rg.stoptime
         FROM t_recite r LEFT JOIN t_user u ON r.createid=u.userid
         LEFT JOIN t_recite_group rg ON rg.reciteid = r.reciteid
-        left join t_class_teacher ct on rg.classid=ct.classid
-        left join t_teacher_subjectbook ts on ct.teacherid=ts.teacherid
-        where ct.teacherid=#{recite.createid} and r.subjectid=ts.subjectid
+        left join t_teacher_subjectbook ts on r.subjectid=ts.subjectid
+        where ts.teacherid=#{recite.createid} and r.subjectid=ts.subjectid
         and ((r.hashb=1 and r.schoolid=#{recite.schoolid} and rg.classid in (${recite.classids})) or
-        (rg.classid in (${recite.bxclassids})))
+        (rg.classid in (${recite.bxclassids})) or r.createid=#{recite.createid})
         <if test="recite.recitestate==1">
-            AND rg.stoptime<![CDATA[ >= ]]>#{recite.nowtime}
+            AND rg.stoptime <![CDATA[ >= ]]>#{recite.nowtime}
         </if>
         <if test="recite.recitestate==2">
-            AND rg.stoptime<![CDATA[ < ]]>#{recite.nowtime}
+            AND rg.stoptime <![CDATA[ < ]]>#{recite.nowtime}
         </if>
         <if test="recite.recitetitle!=null and recite.recitetitle!=''">
             AND r.recitetitle like '%${recite.recitetitle}%'
         </if>
-        GROUP BY r.reciteid ORDER BY rg.starttime desc,r.reciteid asc
+        GROUP BY r.reciteid ORDER BY rg.starttime desc,r.reciteid
     </select>
     <select id="listReciteStu" resultType="java.util.Map">
         select rsid,classid,studentid,rsstate,schoolid from t_recite_student where reciteid=#{reciteid}
     </select>
+    <!--获取背诵年份-->
+    <select id="getYearById" resultType="java.lang.Integer">
+        select year from t_recite where reciteid=#{reciteid}
+    </select>
 </mapper>

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

@@ -3,13 +3,13 @@
 <mapper namespace="com.xhkjedu.sstudy.mapper.resource.GuideMapper">
 
     <resultMap id="guidesForMap" type="com.xhkjedu.sstudy.vo.resource.GuideVo">
-        <result column="guideid" property="guideid"></result>
-        <result column="guidename" property="guidename"></result>
-        <result column="createname" property="createname"></result>
-        <result column="createtime" property="createtime"></result>
-        <result column="costtime" property="costtime"></result>
-        <result column="subjectname" property="subjectname"></result>
-        <result column="createid" property="createid"></result>
+        <result column="guideid" property="guideid"/>
+        <result column="guidename" property="guidename"/>
+        <result column="createname" property="createname"/>
+        <result column="createtime" property="createtime"/>
+        <result column="costtime" property="costtime"/>
+        <result column="subjectname" property="subjectname"/>
+        <result column="createid" property="createid"/>
         <collection property="resources" ofType="java.util.Map"
                     javaType="java.util.List" select="listResourcesByGuideid" column="{guideid=guideid}">
         </collection>
@@ -23,7 +23,7 @@
         left join t_guide_group gg on g.guideid = gg.guideid
         where g.subjectid=#{guide.subjectid}
         and ((g.hashb=1 and g.schoolid=#{guide.schoolid} and gg.classid in (${guide.classids})) or
-        (gg.classid in (${guide.bxclassids})))
+        (gg.classid in (${guide.bxclassids})) or g.createid=#{guide.createid})
         <if test="guide.lsbid!=null and guide.lsbid!='' and guide.lsbid!='0'.toString()">
             and g.lsbid = #{guide.lsbid}
         </if>
@@ -33,7 +33,7 @@
         <if test="guide.guidename!=null and guide.guidename!=''">
             and g.guidename like '%${guide.guidename}%'
         </if>
-        group by g.guideid order by g.createtime desc,g.guidename asc
+        group by g.guideid order by g.createtime desc,g.guidename
     </select>
     <select id="listResourcesByGuideid" resultType="java.util.Map">
         select r.resourceid, r.resourcename,r.resourceurl,r.resourcecover,r.converted,r.pdfurl,
@@ -46,13 +46,13 @@
         select g.guideid,g.guidename,g.createtime,
         g.schoolid,(select u.username from t_user u where g.createid=u.userid)createname,
         count(DISTINCT gr.resourceid)as filenum,r.suffix,r.resourcecover,r.resourceclass,r.converted,
-        sum(r.resourcesize) resourcesize
+        sum(r.resourcesize) as resourcesize
         from t_guide g left join t_guide_resource gr on g.guideid=gr.guideid
         left join t_resource r on gr.resourceid=r.resourceid
         left join t_guide_group gg on g.guideid = gg.guideid
         where g.subjectid=#{guide.subjectid}
         and ((g.hashb=1 and g.schoolid=#{guide.schoolid} and gg.classid in (${guide.classids})) or
-        (gg.classid in (${guide.bxclassids})))
+        (gg.classid in (${guide.bxclassids})) or g.createid=#{guide.createid})
         <if test="guide.lsbid!=null and guide.lsbid!='' and guide.lsbid!='0'.toString()">
             and g.lsbid = #{guide.lsbid}
         </if>
@@ -62,7 +62,7 @@
         <if test="guide.guidename!=null and guide.guidename!=''">
             and g.guidename like '%${guide.guidename}%'
         </if>
-        group by g.guideid order by g.createtime desc,g.guidename asc limit  #{guide.page},#{guide.pageSize}
+        group by g.guideid order by g.createtime desc,g.guidename limit  #{guide.page},#{guide.pageSize}
     </select>
 
     <!--学生预习列表学生网页端-->
@@ -140,7 +140,7 @@
 
     <!--预习统计：年级下教师列表-->
     <select id="listUser" resultType="com.xhkjedu.sstudy.vo.resource.GuideAnalyzeVo">
-        select u.userid teacherid,u.username teachername,s.subjectname,c.gradeid
+        select u.userid as teacherid,u.username teachername,s.subjectname,c.gradeid
         from t_class_teacher ct inner join t_class c on ct.classid=c.classid
         inner join t_teacher_powersb tp on tp.teacherid=ct.teacherid
         inner join t_subject_book sb on sb.lsbid=tp.lsbid
@@ -162,7 +162,7 @@
     <!--预习统计：教师预习统计-->
     <select id="getPreviewAnalyze" resultType="com.xhkjedu.sstudy.vo.resource.GuideAnalyzeVo">
         select g.createid as teacherid,count(distinct ggs.guideid)fbnum,count(distinct ggs.rgsid)yyxnum,
-        count(distinct case when ggs.costtime!=0 then ggs.rgsid else null end)yxnum
+        count(distinct if(ggs.costtime!=0, ggs.rgsid, null))yxnum
         from t_guide g left join t_guide_group_student ggs on ggs.guideid=g.guideid
         left join t_class c on ggs.classid=c.classid
         where g.schoolid=#{paper.schoolid} and ggs.schoolid=#{paper.schoolid}
@@ -193,7 +193,7 @@
         left join t_class c on gg.classid=c.classid
         left join t_guide_resource gr on g.guideid=gr.guideid
         where c.gradeid=#{paper.gradeid} and c.year=#{paper.year}
-        and g.createid=#{paper.teacherid} and gg.schoolid=#{paper.schoolid}
+        and g.createid=#{paper.createid} and gg.schoolid=#{paper.schoolid}
         <if test="paper.starttime!=null and paper.starttime!=0">
             and g.createtime>=#{paper.starttime}
         </if>
@@ -209,14 +209,14 @@
         <if test="paper.subjectid!='0'.toString() and paper.subjectid!=''">
             and g.subjectid=#{paper.subjectid}
         </if>
-        group by g.guideid order by g.createtime desc,g.guidename asc,g.guideid asc
+        group by g.guideid order by g.createtime desc,g.guidename,g.guideid
     </select>
     <!--预习统计-按学生列表-->
     <select id="listPreviewStuGrade1" resultType="java.util.Map">
         select a.*,ifnull(truncate(a.commitnum*100/a.sdnum,2),0)commitrate
         from(select cs.studentid,u.username studentname
-        ,count(distinct case when g.guideid is not null then ggs.rgsid else null end)sdnum
-        ,count(distinct case when ggs.costtime!=0 and g.guideid is not null then ggs.rgsid else null end)commitnum
+        ,count(distinct if(g.guideid is not null, ggs.rgsid, null))sdnum
+        ,count(distinct if(ggs.costtime!=0 and g.guideid is not null, ggs.rgsid, null))commitnum
         from t_class_student cs left join t_class c on cs.classid=c.classid
         left join t_guide_group_student ggs on c.classid=ggs.classid and ggs.studentid=cs.studentid
         left join t_guide g on ggs.guideid=g.guideid
@@ -243,8 +243,8 @@
     <select id="listPreviewStuGrade" resultType="java.util.Map">
         select a.*,ifnull(truncate(a.commitnum*100/a.sdnum,2),0)commitrate
         from(select cs.*
-        ,count(distinct case when g.guideid is not null then ggs.rgsid else null end)sdnum
-        ,count(distinct case when ggs.costtime!=0 and g.guideid is not null then ggs.rgsid else null end)commitnum
+        ,count(distinct if(g.guideid is not null, ggs.rgsid, null))sdnum
+        ,count(distinct if(ggs.costtime!=0 and g.guideid is not null, ggs.rgsid, null))commitnum
         from (select cs2.studentid,u.username studentname
         from t_class_student cs2,t_class c,t_user u
         where c.schoolid=#{paper.schoolid} and c.gradeid=#{paper.gradeid} and c.year=#{paper.year}
@@ -281,7 +281,7 @@
     <select id="listPreviewStuDetail" resultType="com.xhkjedu.sstudy.vo.paper.AStudentPaperVo">
         select a.*,ifnull(truncate(a.commitnum*100/a.sdnum,2),0)commitrate
         from(select s.subjectname
-        ,count(distinct ggs.rgsid)sdnum,count(distinct case when ggs.costtime!=0 then ggs.rgsid else null end)commitnum
+        ,count(distinct ggs.rgsid)sdnum,count(distinct if(ggs.costtime!=0, ggs.rgsid, null))commitnum
         from t_guide_group_student ggs left join t_class c on ggs.classid=c.classid
         left join t_guide g on ggs.guideid=g.guideid
         left join t_subject s on g.subjectid=s.subjectid
@@ -329,7 +329,7 @@
     <!--预习关联班级-->
     <select id="listGuideClassByGuide" resultType="java.util.Map">
         select rs.classid,c.classname,c.gradeid,s.schoolid,s.schoolname,count(distinct rs.rgsid)stunum
-        ,count(distinct case when rs.readtime>0 then rs.rgsid else null end)commitnum
+        ,count(distinct if(rs.readtime>0, rs.rgsid, null))commitnum
         from t_guide_group_student rs left join t_class c on rs.classid = c.classid
         left join t_guide g on rs.guideid=g.guideid
         left join t_school s on rs.schoolid=s.schoolid
@@ -341,4 +341,8 @@
         </if>
         group by rs.classid order by s.createtime desc, c.classtype,c.classorder
     </select>
+    <!--获取预习年份-->
+    <select id="getYearById" resultType="java.lang.Integer">
+        select year from t_guide where guideid=#{guideid}
+    </select>
 </mapper>