作业完善

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

@@ -213,7 +213,8 @@ public class GuideController {
         Integer studentid = paper.getStudentid();
         Integer gradeid = paper.getGradeid();
         N_Utils.validation(new Object[]{studentid,"学生id",1,gradeid,"年级id",1
-                ,paper.getSchoolid(),"学校id",1,paper.getUsertype(),"用户类型",1});
+                ,paper.getSchoolid(),"学校id",1});
+        if (paper.getUsertype() == null) return new ResultVo(1,"用户类型不能为空");
         //guideService.setYear(paper);
         Map map = guideService.listPreviewStuDetail(paper);
         return new ResultVo(0,"获取预习统计--按学生详情成功",map);

sstudy/src/main/java/com/xhkjedu/sstudy/utils/StudyUtil.java

@@ -189,17 +189,22 @@ public class StudyUtil {
                 p.setClasses(null);
                 p.setChecklist(null);
             } else {
-                List<PaperClassVo> classes = p.getClasses();
-                for (PaperClassVo c : classes) {
-                    if (!N_Utils.isEmptyInteger(c.getClassnum())) {
-                        c.setWtjnum(c.getClassnum() - c.getYtjnum());
+                List<Map> schools = p.getSchools();
+                List<PaperClassVo> classes = new ArrayList<>();
+                for (Map school : schools) {
+                    List<PaperClassVo> classList = (List<PaperClassVo>) school.get("classes");
+                    classes.addAll(classList);
+                    for (PaperClassVo c : classList) {
+                        if (!N_Utils.isEmptyInteger(c.getClassnum())) {
+                            c.setWtjnum(c.getClassnum() - c.getYtjnum());
+                        }
                     }
                 }
                 p.setClassnum(classes.stream().mapToInt(c -> c.getClassnum()).sum());
                 p.setYtjnum(classes.stream().mapToInt(c -> c.getYtjnum()).sum());
                 p.setYpgnum(classes.stream().mapToInt(c -> c.getYpgnum()).sum());
 
-                if(p.getChecktype() == 3){
+                /*if(p.getChecktype() == 3){
                     List<Map> rtnList = new ArrayList<>();
                     //指定学生批阅
                     List<Map> checklist = p.getChecklist();
@@ -216,7 +221,7 @@ public class StudyUtil {
                         rtnList.add(map);
                     }
                     p.setChecklist(rtnList);
-                }
+                }*/
             }
         }
         return list;

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

@@ -40,4 +40,7 @@ public class PaperClassVo {
 
     //批改人
     private Integer checkid;
+
+    //学校id
+    private Integer schoolid;
 }

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

@@ -49,6 +49,9 @@ public class PaperListVo {
     //班级集合
     private List<PaperClassVo> classes;
 
+    //学校集合
+    private List<Map> schools;
+
     //批阅
     private List<Map> checklist;
 

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

@@ -75,7 +75,7 @@
         <result property="classnum" column="classnum"></result>
         <result property="ytjnum" column="ytjnum"></result>
         <result property="ypgnum" column="ypgnum"></result>
-        <collection property="classes" ofType="com.xhkjedu.sstudy.vo.paper.PaperClassVo" javaType="java.util.List"
+        <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>
         <collection property="checklist" ofType="java.util.Map" javaType="java.util.List"
@@ -87,17 +87,22 @@
             <result property="gradeid" column="gradeid"></result>
         </collection>
     </resultMap>
-    <resultMap id="classResult" type="com.xhkjedu.sstudy.vo.paper.PaperClassVo">
-        <result property="classid" column="classid"></result>
-        <result property="classname" column="classname"></result>
-        <result property="gradeid" column="gradeid"></result>
-        <result property="classnum" column="classnum"></result>
-        <result property="ytjnum" column="ytjnum"></result>
-        <result property="ypgnum" column="ypgnum"></result>
-        <result property="studentname" column="studentname"></result>
-        <result property="checkid" column="checkid"></result>
-        <result property="teachername" column="teachername"></result>
-        <result property="checked" column="checked"></result>
+    <resultMap id="classResult" type="java.util.Map">
+        <result property="schoolid" column="schoolid"></result>
+        <result property="schoolname" column="schoolname"></result>
+        <collection property="classes" ofType="com.xhkjedu.sstudy.vo.paper.PaperClassVo" javaType="java.util.List">
+            <result property="schoolid" column="schoolid"></result>
+            <result property="classid" column="classid"></result>
+            <result property="classname" column="classname"></result>
+            <result property="gradeid" column="gradeid"></result>
+            <result property="classnum" column="classnum"></result>
+            <result property="ytjnum" column="ytjnum"></result>
+            <result property="ypgnum" column="ypgnum"></result>
+            <result property="studentname" column="studentname"></result>
+            <result property="checkid" column="checkid"></result>
+            <result property="teachername" column="teachername"></result>
+            <result property="checked" column="checked"></result>
+        </collection>
     </resultMap>
     <!--<select id="listClass" resultMap="classResult">
         select count(*)classnum,ps.classid,c.classname,c.gradeid,pg.checked
@@ -120,24 +125,45 @@
     </select>-->
     <!--本校作业班级-->
     <select id="listClass" resultMap="classResult">
-        select count(*) classnum,ps.classid,c.classname,c.gradeid
+        select count(*) classnum,ps.classid,c.classname,c.gradeid,c.schoolid,s.schoolname
         ,count(distinct case when ps.psstate!=0 then ps.psid else null end)ytjnum
         ,count(distinct case when ps.pschecked=1 then ps.psid else null end)ypgnum
         from t_paper_student ps left join t_class c on ps.classid=c.classid
-        where ps.paperid=#{paperid} and ps.classid in (${classids})
+        left join t_school s on c.schoolid = s.schoolid
+        where ps.paperid=#{paperid}
+        <if test="classids!=null and classids!=''">
+            and ps.classid in(${classids})
+        </if>
         group by ps.classid order by c.gradeid,c.classtype,c.classorder
     </select>
     <!--本校作业班级批阅人-->
-    <select id="listPaperCheckStu" resultType="java.util.Map">
+    <resultMap id="checkUserResult" type="java.util.Map">
+        <result property="schoolid" column="schoolid"></result>
+        <result property="schoolname" column="schoolname"></result>
+        <result property="checktype" column="checktype"></result>
+        <collection property="classes" ofType="java.util.Map" javaType="java.util.List">
+            <result property="schoolid" column="schoolid"></result>
+            <result property="classid" column="classid"></result>
+            <result property="classname" column="classname"></result>
+            <result property="gradeid" column="gradeid"></result>
+            <collection property="users" ofType="java.util.Map" javaType="java.util.List">
+                <result property="userid" column="userid"></result>
+                <result property="username" column="username"></result>
+            </collection>
+        </collection>
+    </resultMap>
+    <select id="listPaperCheckStu" resultMap="checkUserResult">
          <if test="checktype==1">
-           select pg.checkid userid,u.username,c.classid,c.classname,c.gradeid from t_paper_class pg
+           select pg.checkid userid,u.username,c.classid,c.classname,c.gradeid,pg.schoolid,s.schoolname
+           from t_paper_class pg left join t_school s on pg.schoolid=s.schoolid
            left join t_user u on pg.checkid=u.userid
            left join t_class c on pg.classid=c.classid
            where pg.paperid=#{paperid} and pg.schoolid=#{logschoolid}
            order by c.gradeid,c.classtype,c.classorder,convert(u.username using gbk)
        </if>
        <if test="checktype==3">
-           select ps.checkid userid,u.username,c.classid,c.classname,c.gradeid from t_paper_student ps
+           select ps.checkid userid,u.username,c.classid,c.classname,c.gradeid,ps.schoolid,s.schoolname
+           from t_paper_student ps left join t_school s on ps.schoolid=s.schoolid
            left join t_user u on ps.checkid=u.userid
            left join t_class c on ps.classid=c.classid
            where ps.paperid=#{paperid} and ps.schoolid=#{logschoolid}

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

@@ -164,7 +164,8 @@
         count(distinct case when ggs.costtime!=0 then ggs.rgsid else null end)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 c.schoolid=#{paper.schoolid} and c.gradeid=#{paper.gradeid} and c.year=#{paper.year}
+        where g.schoolid=#{paper.schoolid} and ggs.schoolid=#{paper.schoolid}
+        and c.gradeid=#{paper.gradeid} and c.year=#{paper.year}
         <if test="paper.starttime!=null and paper.starttime!=0">
             and g.createtime>=#{paper.starttime}
         </if>
@@ -190,7 +191,8 @@
         left join t_guide_group gg on gg.guideid=g.guideid
         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}
+        where c.gradeid=#{paper.gradeid} and c.year=#{paper.year}
+        and g.createid=#{paper.teacherid} and gg.schoolid=#{paper.schoolid}
         <if test="paper.starttime!=null and paper.starttime!=0">
             and g.createtime>=#{paper.starttime}
         </if>