Merge remote-tracking branch 'origin/2022-9-20' into ywx

# Conflicts:
#	sapi/src/main/java/com/xhkjedu/sapi/controller/system/SchoolController.java
#	sapi/src/main/java/com/xhkjedu/sapi/mapper/system/SchoolMapper.java
#	sapi/src/main/java/com/xhkjedu/sapi/service/system/SchoolService.java
#	sapi/src/main/resources/mapper/system/SchoolMapper.xml
#	suser/src/main/java/com/xhkjedu/suser/service/system/UserService.java

sapi/src/main/java/com/xhkjedu/sapi/controller/analyze/SchoolPeopleController.java

@@ -2,10 +2,10 @@ package com.xhkjedu.sapi.controller.analyze;
 
 import com.xhkjedu.sapi.model.gradeclass.TClass;
 import com.xhkjedu.sapi.service.analyze.SchoolPeopleService;
-import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.vo.ResultVo;
 import com.xhkjedu.sapi.vo.analyze.SchoolPeopleGradeVo;
 import com.xhkjedu.sapi.vo.analyze.SchoolPeopleNumVo;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -37,7 +37,7 @@ public class SchoolPeopleController {
     @PostMapping("/allnum")
     public ResultVo getSchoolAllNum(@RequestBody TClass tClass){
         N_Utils.validation(new Object[]{tClass.getSchoolid(),"学校id",1});
-        SchoolPeopleNumVo sp = schoolPeopleService.getSchoolAllNum(tClass.getSchoolid());
+        SchoolPeopleNumVo sp = schoolPeopleService.getSchoolAllNum(tClass.getSchoolid(), tClass.getYear());
         return  new ResultVo(0,"",sp);
     }
 
@@ -51,7 +51,7 @@ public class SchoolPeopleController {
     @PostMapping("/gradenum")
     public ResultVo getSchoolGradeNum(@RequestBody TClass tClass){
         N_Utils.validation(new Object[]{tClass.getSchoolid(),"学校id",1});
-        List<SchoolPeopleGradeVo> list = schoolPeopleService.listSchoolGrades(tClass.getSchoolid());
+        List<SchoolPeopleGradeVo> list = schoolPeopleService.listSchoolGrades(tClass.getSchoolid(), tClass.getYear());
         return new ResultVo(0,"",list);
     }
 
@@ -65,7 +65,7 @@ public class SchoolPeopleController {
     @PostMapping("/gradeclass")
     public ResultVo listSchoolGradeClasses(@RequestBody TClass tClass){
         N_Utils.validation(new Object[]{tClass.getSchoolid(),"学校id",1});
-        List<SchoolPeopleGradeVo> list = schoolPeopleService.listSchoolGradeClasses(tClass.getSchoolid());
+        List<SchoolPeopleGradeVo> list = schoolPeopleService.listSchoolGradeClasses(tClass.getSchoolid(), tClass.getYear());
         return new ResultVo(0,"",list);
     }
 

sapi/src/main/java/com/xhkjedu/sapi/controller/analyze/SchoolSummaryController.java

@@ -1,10 +1,10 @@
 package com.xhkjedu.sapi.controller.analyze;
 
 import com.xhkjedu.sapi.service.analyze.SchoolSummaryService;
-import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.vo.ResultVo;
 import com.xhkjedu.sapi.vo.analyze.SchoolParams;
 import com.xhkjedu.sapi.vo.analyze.SchoolSummaryVo;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -28,9 +28,8 @@ public class SchoolSummaryController {
     //数据汇总
     @PostMapping("/summary")
     public ResultVo listSchoolTaskWork(@RequestBody SchoolParams srparams){
-        N_Utils.validation(new Object[]{srparams.getSchoolid(),"学校id",1,
-                srparams.getGradeid(),"年级",1,
-                srparams.getStarttime(),"开始时间",1,srparams.getStoptime(),"结束时间",1});
+        N_Utils.validation(new Object[]{srparams.getSchoolid(), "学校id", 1,
+                srparams.getGradeid(), "年级", 1});
         List<SchoolSummaryVo> lst = schoolSummaryService.schoolSummary(srparams);
         return new ResultVo(0,"",lst);
     }

sapi/src/main/java/com/xhkjedu/sapi/controller/system/SchoolController.java

@@ -174,4 +174,18 @@ public class SchoolController {
 
 
 
+     /* 获取学年列表
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [tSchool]
+     * @Author ywx
+     * @Date 2022/9/20 10:04
+     **/
+    @PostMapping("/list_year")
+    public ResultVo listYear(@RequestBody TSchool tSchool) {
+        Integer schoolid = tSchool.getSchoolid();
+        N_Utils.validation(new Object[]{schoolid, "学校id", 1});
+        List<Integer> list = schoolService.listYear(schoolid);
+        return new ResultVo(0, "获取列表成功", list);
+    }
 }

sapi/src/main/java/com/xhkjedu/sapi/mapper/system/SchoolMapper.java

@@ -60,4 +60,7 @@ public interface SchoolMapper extends TkMapper<TSchool> {
 
     //获取准考证号长度限制
     Integer getLimiteNoLen(@Param("schoolid") Integer schoolid);
+
+    //获取学年列表
+    List<Integer> listYear(@Param("schoolid") Integer schoolid);
 }

sapi/src/main/java/com/xhkjedu/sapi/service/analyze/SchoolPeopleService.java

@@ -2,10 +2,10 @@ package com.xhkjedu.sapi.service.analyze;
 
 import com.xhkjedu.sapi.mapper.analyze.SchoolPeopleMapper;
 import com.xhkjedu.sapi.mapper.system.SchoolMapper;
-import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.sapi.vo.analyze.SchoolPeopleGradeVo;
 import com.xhkjedu.sapi.vo.analyze.SchoolPeopleNumVo;
 import com.xhkjedu.sapi.vo.analyze.SchoolPeopleStuSexVo;
+import com.xhkjedu.utils.N_Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -28,24 +28,26 @@ public class SchoolPeopleService {
     private SchoolMapper schoolMapper;
 
     /**
-     *功能描述 全校概况--班级、师生数量
+     * 功能描述 全校概况--班级、师生数量
+     *
+     * @param *    @param schoolid
+     * @param year
+     * @return com.xhkjedu.vo.analyze.SchoolPeopleNumVo
      * @author WN
      * @date 2020/8/8
-     * @param  * @param schoolid
-     * @return com.xhkjedu.vo.analyze.SchoolPeopleNumVo
      */
-    public SchoolPeopleNumVo getSchoolAllNum(Integer schoolid){
-        Integer year = schoolMapper.getYearById(schoolid);
-        SchoolPeopleNumVo rtnsp = schoolPeopleMapper.getSchoolClassNum(schoolid,year);
-        if(rtnsp!=null){
+    public SchoolPeopleNumVo getSchoolAllNum(Integer schoolid, Integer year) {
+        //Integer year = schoolMapper.getYearById(schoolid);
+        SchoolPeopleNumVo rtnsp = schoolPeopleMapper.getSchoolClassNum(schoolid, year);
+        if (rtnsp != null) {
             //性别数量
-            List<SchoolPeopleStuSexVo> sexlist = schoolPeopleMapper.listSchoolStudentSexnum(schoolid,year);
-            for(SchoolPeopleStuSexVo ssex:sexlist){
-                if(ssex.getUsersex()==1){
+            List<SchoolPeopleStuSexVo> sexlist = schoolPeopleMapper.listSchoolStudentSexnum(schoolid, year);
+            for (SchoolPeopleStuSexVo ssex : sexlist) {
+                if (ssex.getUsersex() == 1) {
                     rtnsp.setBoystunum(ssex.getSexnum());
-                }else if (ssex.getUsersex()==2){
+                } else if (ssex.getUsersex() == 2) {
                     rtnsp.setGirlstunum(ssex.getSexnum());
-                }else {
+                } else {
                     rtnsp.setWzxbstunum(ssex.getSexnum());
                 }
             }
@@ -57,15 +59,17 @@ public class SchoolPeopleService {
     }
 
     /**
-     *功能描述 全校概况--年级下教师班级学生数量
+     * 功能描述 全校概况--年级下教师班级学生数量
+     *
+     * @param *    @param schoolid
+     * @param year
+     * @return java.util.List<com.xhkjedu.vo.analyze.SchoolPeopleGradeVo>
      * @author WN
      * @date 2020/8/8
-     * @param  * @param schoolid
-     * @return java.util.List<com.xhkjedu.vo.analyze.SchoolPeopleGradeVo>
      */
-    public List<SchoolPeopleGradeVo> listSchoolGrades(Integer schoolid){
-        Integer year = schoolMapper.getYearById(schoolid);
-        List<SchoolPeopleGradeVo> list = schoolPeopleMapper.listSchoolGrades(schoolid,year);
+    public List<SchoolPeopleGradeVo> listSchoolGrades(Integer schoolid, Integer year) {
+        //Integer year = schoolMapper.getYearById(schoolid);
+        List<SchoolPeopleGradeVo> list = schoolPeopleMapper.listSchoolGrades(schoolid, year);
         Integer totalNum = list.stream().collect(Collectors.summingInt(SchoolPeopleGradeVo::getStudentnum));
         for (SchoolPeopleGradeVo p : list) {
             p.setNumrate(N_Utils.getIntegerDivideAndMulitiply(p.getStudentnum(), totalNum));
@@ -94,15 +98,17 @@ public class SchoolPeopleService {
     }
 
     /**
-     *功能描述 全校概况--年级下各班级情况统计
+     * 功能描述 全校概况--年级下各班级情况统计
+     *
+     * @param *    @param schoolid
+     * @param year
+     * @return java.util.List<com.xhkjedu.vo.analyze.SchoolPeopleGradeVo>
      * @author WN
      * @date 2020/8/8
-     * @param  * @param schoolid
-     * @return java.util.List<com.xhkjedu.vo.analyze.SchoolPeopleGradeVo>
      */
-    public List<SchoolPeopleGradeVo> listSchoolGradeClasses(Integer schoolid){
-        Integer year = schoolMapper.getYearById(schoolid);
-        return schoolPeopleMapper.listSchoolGradeClasses(schoolid,year);
+    public List<SchoolPeopleGradeVo> listSchoolGradeClasses(Integer schoolid, Integer year) {
+        //Integer year = schoolMapper.getYearById(schoolid);
+        return schoolPeopleMapper.listSchoolGradeClasses(schoolid, year);
     }
 
 }

sapi/src/main/java/com/xhkjedu/sapi/service/analyze/SchoolRoomService.java

@@ -2,9 +2,9 @@ package com.xhkjedu.sapi.service.analyze;
 
 import com.xhkjedu.sapi.mapper.analyze.SchoolRoomMapper;
 import com.xhkjedu.sapi.mapper.system.SchoolMapper;
-import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.sapi.vo.analyze.*;
 import com.xhkjedu.sapi.vo.analyze.room.SchoolRoomVo;
+import com.xhkjedu.utils.N_Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -78,8 +78,8 @@ public class SchoolRoomService {
     }
 
     private void setTime(SchoolParams sparams) {
-        Integer year = schoolMapper.getYearById(sparams.getSchoolid());
-        sparams.setYear(year);
+        //Integer year = schoolMapper.getYearById(sparams.getSchoolid());
+        //sparams.setYear(year);
         if (!N_Utils.isEmptyInteger(sparams.getType())) {
             Long endtime = N_Utils.getNowtimestamp();
             Long starttime = N_Utils.getLongGoTime(sparams.getType());

sapi/src/main/java/com/xhkjedu/sapi/service/analyze/SchoolSummaryService.java

@@ -28,14 +28,14 @@ public class SchoolSummaryService {
 
     //数据汇总
     public List<SchoolSummaryVo> schoolSummary(SchoolParams params) {
-        Integer year = schoolMapper.getYearById(params.getSchoolid());
-        params.setYear(year);
+        //Integer year = schoolMapper.getYearById(params.getSchoolid());
+        //params.setYear(year);
         List<SchoolSummaryVo> users = schoolSummaryMapper.listUser(params);
         //教师作业统计
         List<SchoolSummaryVo> paperlist = schoolSummaryMapper.getPaperAnalyze(params);
-        for(SchoolSummaryVo paper : paperlist){
+        for (SchoolSummaryVo paper : paperlist) {
             SchoolSummaryVo user = users.stream().filter(u -> u.getUserid().equals(paper.getUserid())).findFirst().orElse(null);
-            if(user != null){
+            if (user != null) {
                 user.setPfabunum(paper.getPfabunum());
                 Integer stunum = paper.getPstunum();
                 user.setPstunum(stunum);

sapi/src/main/java/com/xhkjedu/sapi/service/analyze/SchoolTaskService.java

@@ -86,8 +86,8 @@ public class SchoolTaskService {
     }
 
     private void setTime(SchoolParams params) {
-        Integer year = schoolMapper.getYearById(params.getSchoolid());
-        params.setYear(year);
+        //Integer year = schoolMapper.getYearById(params.getSchoolid());
+        //params.setYear(year);
         if (!N_Utils.isEmptyInteger(params.getType())) {
             Long endtime = N_Utils.getNowtimestamp();
             Long starttime = N_Utils.getLongGoTime(params.getType());

sapi/src/main/java/com/xhkjedu/sapi/service/system/SchoolService.java

@@ -517,4 +517,8 @@ public class SchoolService {
         }
     }
 
+    //获取学年列表
+    public List<Integer> listYear(Integer schoolid) {
+        return schoolMapper.listYear(schoolid);
+    }
 }

sapi/src/main/resources/mapper/analyze/SchoolRoomMapper.xml

@@ -18,7 +18,12 @@
          LEFT JOIN t_subject s ON sb.subjectid = s.subjectid
          LEFT JOIN t_user u ON r.createid=u.userid
           WHERE r.roomstate=2 AND r.schoolid=#{sparams.schoolid} and c.gradeid=#{sparams.gradeid} and c.year=#{sparams.year} AND u.userstate=1
-           AND r.createtime<![CDATA[ >= ]]>#{sparams.starttime} AND r.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+        <if test="sparams.starttime!=null and sparams.starttime!=0">
+            AND r.createtime<![CDATA[ >= ]]>#{sparams.starttime}
+        </if>
+        <if test="sparams.stoptime!=null and sparams.stoptime!=0">
+            AND r.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+        </if>
           GROUP BY r.roomid ORDER BY s.subjectorder
     </select>
 
@@ -60,8 +65,12 @@
         <if test="sparams.username!=null and sparams.username!=''">
             AND u.username like '%${sparams.username}%'
         </if>
-
-        AND r.createtime<![CDATA[ >= ]]>#{sparams.starttime} AND r.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+        <if test="sparams.starttime!=null and sparams.starttime!=0">
+            AND r.createtime<![CDATA[ >= ]]>#{sparams.starttime}
+        </if>
+        <if test="sparams.stoptime!=null and sparams.stoptime!=0">
+            AND r.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+        </if>
          GROUP BY r.roomid
     </select>
 

sapi/src/main/resources/mapper/analyze/SchoolSummaryMapper.xml

@@ -30,7 +30,12 @@
         <if test="sparams.subjectid!=null and sparams.subjectid!='0'.toString() and sparams.subjectid!=''">
             and p.subjectid=#{sparams.subjectid}
         </if>
-        and p.createtime>=#{sparams.starttime} and UNIX_TIMESTAMP(FROM_UNIXTIME(p.createtime,'%Y%m%d'))&lt;=#{sparams.stoptime}
+        <if test="sparams.starttime!=null and sparams.starttime!=0">
+            and p.createtime>=#{sparams.starttime}
+        </if>
+        <if test="sparams.stoptime!=null and sparams.stoptime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(p.createtime,'%Y%m%d'))&lt;=#{sparams.stoptime}
+        </if>
         group by p.createid
     </select>
     <!--获取教师资源统计-->
@@ -49,7 +54,12 @@
         <if test="sparams.subjectid!=null and sparams.subjectid!='0'.toString() and sparams.subjectid!=''">
             and r.subjectid=#{sparams.subjectid}
         </if>
-        and r.createtime>=#{sparams.starttime} and UNIX_TIMESTAMP(FROM_UNIXTIME(r.createtime,'%Y%m%d'))&lt;=#{sparams.stoptime}
+        <if test="sparams.starttime!=null and sparams.starttime!=0">
+            and r.createtime>=#{sparams.starttime}
+        </if>
+        <if test="sparams.stoptime!=null and sparams.stoptime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(r.createtime,'%Y%m%d'))&lt;=#{sparams.stoptime}
+        </if>
         group by r.createid
     </select>
     <!--获取教师课堂统计-->
@@ -69,7 +79,12 @@
         <if test="sparams.subjectid!=null and sparams.subjectid!='0'.toString() and sparams.subjectid!=''">
             and sb.subjectid=#{sparams.subjectid}
         </if>
-        and r.createtime>=#{sparams.starttime} and UNIX_TIMESTAMP(FROM_UNIXTIME(r.createtime,'%Y%m%d'))&lt;=#{sparams.stoptime}
+        <if test="sparams.starttime!=null and sparams.starttime!=0">
+            and r.createtime>=#{sparams.starttime}
+        </if>
+        <if test="sparams.stoptime!=null and sparams.stoptime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(r.createtime,'%Y%m%d'))&lt;=#{sparams.stoptime}
+        </if>
         group by r.roomid
     </select>
     <!--获取教师预习统计-->
@@ -84,7 +99,12 @@
         <if test="sparams.subjectid!=null and sparams.subjectid!='0'.toString() and sparams.subjectid!=''">
             and g.subjectid=#{sparams.subjectid}
         </if>
-        and g.createtime>=#{sparams.starttime} and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))&lt;=#{sparams.stoptime}
+        <if test="sparams.starttime!=null and sparams.starttime!=0">
+            and g.createtime>=#{sparams.starttime}
+        </if>
+        <if test="sparams.stoptime!=null and sparams.stoptime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))&lt;=#{sparams.stoptime}
+        </if>
         group by g.createid
     </select>
     <!--获取教师背诵统计-->
@@ -99,7 +119,12 @@
         <if test="sparams.subjectid!=null and sparams.subjectid!='0'.toString() and sparams.subjectid!=''">
             and r.subjectid=#{sparams.subjectid}
         </if>
-        and r.createtime>=#{sparams.starttime} and UNIX_TIMESTAMP(FROM_UNIXTIME(r.createtime,'%Y%m%d'))&lt;=#{sparams.stoptime}
+        <if test="sparams.starttime!=null and sparams.starttime!=0">
+            and r.createtime>=#{sparams.starttime}
+        </if>
+        <if test="sparams.stoptime!=null and sparams.stoptime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(r.createtime,'%Y%m%d'))&lt;=#{sparams.stoptime}
+        </if>
         group by r.createid
     </select>
     <!--获取错题辅导统计-->
@@ -110,7 +135,12 @@
         left join t_class c on c.classid=qc.classid and c.schoolid=qc.schoolid
         where qc.schoolid=#{sparams.schoolid}
         and c.gradeid=#{sparams.gradeid} and c.year=#{sparams.year}
-        and qe.createtime>=#{sparams.starttime} and UNIX_TIMESTAMP(FROM_UNIXTIME(qe.createtime,'%Y%m%d'))&lt;=#{sparams.stoptime}
+        <if test="sparams.starttime!=null and sparams.starttime!=0">
+            and qe.createtime>=#{sparams.starttime}
+        </if>
+        <if test="sparams.stoptime!=null and sparams.stoptime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(qe.createtime,'%Y%m%d'))&lt;=#{sparams.stoptime}
+        </if>
         group by qe.qcpid,qe.createid)qe
         group by qe.createid
     </select>

sapi/src/main/resources/mapper/analyze/SchoolTaskMapper.xml

@@ -25,7 +25,12 @@
         LEFT JOIN t_class c ON pg.classid=c.classid
         LEFT JOIN T_USER U ON p.createid=u.userid
         WHERE p.paperstate=22 AND p.schoolid=#{sparams.schoolid} AND c.gradeid=#{sparams.gradeid} and c.year=#{sparams.year} AND u.userstate=1
-        AND p.createtime<![CDATA[ >= ]]>#{sparams.starttime} AND p.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+        <if test="sparams.starttime!=null and sparams.starttime!=0">
+            AND p.createtime<![CDATA[ >= ]]>#{sparams.starttime}
+        </if>
+        <if test="sparams.stoptime!=null and sparams.stoptime!=0">
+            AND p.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+        </if>
         GROUP BY p.subjectid ORDER BY s.subjectorder
     </select>
 
@@ -39,7 +44,12 @@
         left join t_paper_student ps1 on ps1.paperid=pg.paperid and ps1.classid=pg.classid
         left join t_class c on c.classid=pg.classid
         where p.schoolid=#{sparams.schoolid} and p.paperstate=22 and c.gradeid=#{sparams.gradeid} and c.year=#{sparams.year}
-        and p.createtime<![CDATA[ >= ]]>#{sparams.starttime} and p.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+        <if test="sparams.starttime!=null and sparams.starttime!=0">
+            AND p.createtime<![CDATA[ >= ]]>#{sparams.starttime}
+        </if>
+        <if test="sparams.stoptime!=null and sparams.stoptime!=0">
+            AND p.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+        </if>
         <if test="sparams.subjectid!=null and sparams.subjectid!='0'.toString() and sparams.subjectid!=''">
             and p.subjectid=#{sparams.subjectid}
         </if>
@@ -56,7 +66,12 @@
          LEFT JOIN t_subject s ON g.subjectid=s.subjectid
          LEFT JOIN T_USER U ON g.createid=u.userid
          WHERE g.schoolid=#{sparams.schoolid} AND c.gradeid=#{sparams.gradeid} and c.year=#{sparams.year} and u.userstate=1
-         AND g.createtime<![CDATA[ >= ]]>#{sparams.starttime} AND g.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+        <if test="sparams.starttime!=null and sparams.starttime!=0">
+            AND g.createtime<![CDATA[ >= ]]>#{sparams.starttime}
+        </if>
+        <if test="sparams.stoptime!=null and sparams.stoptime!=0">
+            AND g.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+        </if>
          GROUP BY g.subjectid ORDER BY s.subjectorder
     </select>
     <select id="listSchoolTaskGuideDetail" resultType="com.xhkjedu.sapi.vo.analyze.work.SchoolWorkSubjectVo">
@@ -66,7 +81,12 @@
         from t_guide g left join t_guide_group_student ggs on ggs.guideid=g.guideid
         left join t_class c on c.classid=ggs.classid
         where g.schoolid=#{sparams.schoolid} and c.gradeid=#{sparams.gradeid} and c.year=#{sparams.year}
-        and g.createtime<![CDATA[ >= ]]>#{sparams.starttime} and g.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+        <if test="sparams.starttime!=null and sparams.starttime!=0">
+            AND g.createtime<![CDATA[ >= ]]>#{sparams.starttime}
+        </if>
+        <if test="sparams.stoptime!=null and sparams.stoptime!=0">
+            AND g.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+        </if>
         <if test="sparams.subjectid!=null and sparams.subjectid!='0'.toString() and sparams.subjectid!=''">
             and g.subjectid=#{sparams.subjectid}
         </if>
@@ -84,7 +104,12 @@
          LEFT JOIN t_class c ON rs.classid=c.classid
          LEFT JOIN T_USER U ON r.createid=u.userid
          WHERE r.recitestate=22 AND r.schoolid=#{sparams.schoolid} AND c.gradeid=#{sparams.gradeid} and c.year=#{sparams.year} AND u.userstate=1
-         AND r.createtime<![CDATA[ >= ]]>#{sparams.starttime} AND r.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+        <if test="sparams.starttime!=null and sparams.starttime!=0">
+            AND r.createtime<![CDATA[ >= ]]>#{sparams.starttime}
+        </if>
+        <if test="sparams.stoptime!=null and sparams.stoptime!=0">
+            AND r.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+        </if>
          GROUP BY r.subjectid ORDER BY s.subjectorder
     </select>
 
@@ -96,7 +121,12 @@
         from t_recite r left join t_recite_student rs on rs.reciteid=r.reciteid
         left join t_class c on c.classid=rs.classid
         where r.schoolid=#{sparams.schoolid} and r.recitestate=22 and c.gradeid=#{sparams.gradeid} and c.year=#{sparams.year}
-        and r.createtime<![CDATA[ >= ]]>#{sparams.starttime} and r.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+        <if test="sparams.starttime!=null and sparams.starttime!=0">
+            AND r.createtime<![CDATA[ >= ]]>#{sparams.starttime}
+        </if>
+        <if test="sparams.stoptime!=null and sparams.stoptime!=0">
+            AND r.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+        </if>
         <if test="sparams.subjectid!=null and sparams.subjectid!='0'.toString() and sparams.subjectid!=''">
             and r.subjectid=#{sparams.subjectid}
         </if>

sapi/src/main/resources/mapper/system/SchoolMapper.xml

@@ -104,4 +104,8 @@
     <select id="getLimiteNoLen" resultType="java.lang.Integer">
         select limitenolen from t_school where schoolid=#{schoolid}
     </select>
+    <!--获取学年列表-->
+    <select id="listYear" resultType="java.lang.Integer">
+        select c.year from t_class c where c.schoolid=#{schoolid} and c.classtype=1 and c.classstate=1 group by c.year
+    </select>
 </mapper>

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

@@ -173,7 +173,7 @@ public class PaperAnalyzeController {
         Integer teacherid = paper.getTeacherid();
         Integer gradeid = paper.getGradeid();
         N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1,teacherid,"教师id",1,gradeid,"年级id",1});
-        paperAnalyzeService.setYear(paper);
+        //paperAnalyzeService.setYear(paper);
         paperAnalyzeService.setClassIds(paper);//设置教师权限班级
         PageHelper.startPage(page, pageSize);
         List<PaperListVo> list = paperAnalyzeService.listPaper(paper);
@@ -200,7 +200,7 @@ public class PaperAnalyzeController {
         Integer pageSize = paper.getPageSize();
         N_Utils.validation(new Object[]{schoolid, "学校id", 1, gradeid, "年级id", 1
                 , page, "显示页码", 1, pageSize, "显示条数", 1});
-        paperAnalyzeService.setYear(paper);
+        //paperAnalyzeService.setYear(paper);
         paperAnalyzeService.setClassIds(paper);
         List<AStudentPaperVo> list = paperAnalyzeService.listPaperStuGrade(paper);
         Integer start = (page - 1) * pageSize;
@@ -216,7 +216,7 @@ public class PaperAnalyzeController {
         Integer studentid = paper.getStudentid();
         Integer gradeid = paper.getGradeid();
         N_Utils.validation(new Object[]{studentid,"学生id",1,gradeid,"年级id",1});
-        paperAnalyzeService.setYear(paper);
+        //paperAnalyzeService.setYear(paper);
         Map map = paperAnalyzeService.listPaperStuDetail(paper);
         return new ResultVo(0,"获取作业统计--按学生详情成功",map);
     }

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

@@ -4,13 +4,13 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.sstudy.model.resource.TGuide;
 import com.xhkjedu.sstudy.service.resource.GuideService;
+import com.xhkjedu.sstudy.vo.paper.AnalyzeSearchVo;
+import com.xhkjedu.sstudy.vo.resource.GuideAnalyzeVo;
+import com.xhkjedu.sstudy.vo.resource.GuideVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
-import com.xhkjedu.sstudy.vo.paper.AnalyzeSearchVo;
-import com.xhkjedu.sstudy.vo.resource.GuideAnalyzeVo;
-import com.xhkjedu.sstudy.vo.resource.GuideVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
@@ -154,7 +154,7 @@ public class GuideController {
         Integer teacherid = paper.getTeacherid();
         Integer gradeid = paper.getGradeid();
         N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1,teacherid,"教师id",1,gradeid,"年级id",1});
-        guideService.setYear(paper);
+        //guideService.setYear(paper);
         guideService.setClassIds(paper);
         PageHelper.startPage(page, pageSize);
         List<Map> list = guideService.listPreview(paper);
@@ -171,7 +171,7 @@ public class GuideController {
         Integer pageSize = paper.getPageSize();
         N_Utils.validation(new Object[]{schoolid,"学校id",1,gradeid,"年级id",1
                 ,page,"显示页码",1,pageSize,"显示条数",1});
-        guideService.setYear(paper);
+        //guideService.setYear(paper);
         guideService.setClassIds(paper);
         PageHelper.startPage(page, pageSize);
         List<Map> list = guideService.listPreviewStuGrade(paper);
@@ -185,7 +185,7 @@ public class GuideController {
         Integer studentid = paper.getStudentid();
         Integer gradeid = paper.getGradeid();
         N_Utils.validation(new Object[]{studentid,"学生id",1,gradeid,"年级id",1});
-        guideService.setYear(paper);
+        //guideService.setYear(paper);
         Map map = guideService.listPreviewStuDetail(paper);
         return new ResultVo(0,"获取预习统计--按学生详情成功",map);
     }

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

@@ -19,7 +19,7 @@ public interface ClassMapper extends TkMapper<TClass> {
     List<AStudentPaperVo> listStu(@Param("paper") AnalyzeSearchVo paper);
 
     //班级教师--获取教师任教行政和提高班id
-    String getClassIds(Integer teacherid);
+    String getClassIds(@Param("paper") AnalyzeSearchVo paper);
 
     //班级分组--分组下学生
     List<Integer> listStudentidsByGroupids(@Param("groupids") String groupids);

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

@@ -9,17 +9,8 @@ import com.xhkjedu.sstudy.model.paper.TPaper;
 import com.xhkjedu.sstudy.model.paper.TPaperAnalyze;
 import com.xhkjedu.sstudy.model.paper.TPaperFile;
 import com.xhkjedu.sstudy.model.paperstudent.TPaperGroup;
-import com.xhkjedu.sstudy.model.system.TSchool;
 import com.xhkjedu.sstudy.vo.gradeclass.CStudentVo;
-import com.xhkjedu.sstudy.vo.paper.AStudentPaperVo;
-import com.xhkjedu.sstudy.vo.paper.AnalyzeQuestionVo;
-import com.xhkjedu.sstudy.vo.paper.AnalyzeSearchVo;
-import com.xhkjedu.sstudy.vo.paper.AnalyzeStudentVo;
-import com.xhkjedu.sstudy.vo.paper.PaperAnalyzeVo;
-import com.xhkjedu.sstudy.vo.paper.PaperCAnalyzeVo;
-import com.xhkjedu.sstudy.vo.paper.PaperGAnalyzeVo;
-import com.xhkjedu.sstudy.vo.paper.PaperListVo;
-import com.xhkjedu.sstudy.vo.paper.QuestionAnalyzeVo;
+import com.xhkjedu.sstudy.vo.paper.*;
 import com.xhkjedu.sstudy.vo.paperstudent.StudentPaperTypeVo;
 import com.xhkjedu.sstudy.vo.paperstudent.StudentPaperVo;
 import com.xhkjedu.utils.N_Utils;
@@ -27,12 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.DoubleSummaryStatistics;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -245,7 +231,7 @@ public class PaperAnalyzeService {
      * @return java.util.List<com.xhkjedu.sstudy.vo.paper.PaperGAnalyzeVo>
      **/
     public List<PaperGAnalyzeVo> listPaperGrade(AnalyzeSearchVo paper) {
-        setYear(paper);
+        //setYear(paper);
         setClassIds(paper);//设置教师权限班级
         List<PaperGAnalyzeVo> list = paperAnalyzeMapper.listUser(paper);
         List<PaperGAnalyzeVo> teapapers = paperAnalyzeMapper.getPaperGrade(paper);//发布作业的教师发布作业情况
@@ -286,7 +272,7 @@ public class PaperAnalyzeService {
     //设置教师权限班级
     public void setClassIds(AnalyzeSearchVo paper) {
         if (paper.getUsertype() == 1 && N_Utils.isEmptyInteger(paper.getClassid())) {
-            String classIds = classMapper.getClassIds(paper.getTeacherid());//获取教师任教行政和提高班id
+            String classIds = classMapper.getClassIds(paper);//获取教师任教行政和提高班id
             paper.setClassids(classIds);
         }
     }
@@ -380,15 +366,16 @@ public class PaperAnalyzeService {
     public Map listPaperStuExport(AnalyzeSearchVo paper) {
         Map map = new HashMap();
         Integer schoolid = paper.getSchoolid();
-        TSchool school = schoolMapper.selectByPrimaryKey(schoolid);
-        paper.setYear(school.getYear());
+        //TSchool school = schoolMapper.selectByPrimaryKey(schoolid);
+        //paper.setYear(school.getYear());
         setClassIds(paper);//设置教师权限班级
         List<AStudentPaperVo> subjects = new ArrayList<>();
         List<AStudentPaperVo> students = classMapper.listStu(paper);
         List<AStudentPaperVo> stupapers = paperAnalyzeMapper.listPaperAllClassStu(paper);//年级下所有学生关联的作业
         Map<String, String> subjectMap = new HashMap<>();//科目集合
         if (N_Utils.isListNotEmpty(stupapers)) {
-            List<String> subjectids = stupapers.stream().map(AStudentPaperVo::getSubjectid).distinct().collect(Collectors.toList());
+            List<String> subjectids =
+                    stupapers.stream().map(AStudentPaperVo::getSubjectid).distinct().collect(Collectors.toList());
             List<Map<String, String>> subjectNames = subjectMapper.listNameByIds(subjectids);//根据科目ids获取名称列表
             for (Map<String, String> subject : subjectNames) {
                 subjectMap.put(subject.get("subjectid"), subject.get("subjectname"));

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

@@ -6,7 +6,6 @@ import com.xhkjedu.sstudy.mapper.resource.*;
 import com.xhkjedu.sstudy.mapper.subjectbook.SubjectMapper;
 import com.xhkjedu.sstudy.mapper.system.SchoolMapper;
 import com.xhkjedu.sstudy.model.resource.*;
-import com.xhkjedu.sstudy.model.system.TSchool;
 import com.xhkjedu.sstudy.utils.ConvertUtil;
 import com.xhkjedu.sstudy.utils.StudyUtil;
 import com.xhkjedu.sstudy.vo.paper.AStudentPaperVo;
@@ -265,7 +264,7 @@ public class GuideService {
      * @return java.util.List<com.xhkjedu.vo.resource.GuideAnalyzeVo>
      **/
     public List<GuideAnalyzeVo> getPreviewAnalyze(AnalyzeSearchVo paper) {
-        setYear(paper);
+        //setYear(paper);
         setClassIds(paper);//设置教师权限班级
         List<GuideAnalyzeVo> list = guideMapper.listUser(paper);
         List<GuideAnalyzeVo> guidelist = guideMapper.getPreviewAnalyze(paper);//获取有预习教师的预习情况
@@ -305,7 +304,7 @@ public class GuideService {
     //设置教师权限班级
     public void setClassIds(AnalyzeSearchVo paper) {
         if (paper.getUsertype() == 1 && N_Utils.isEmptyInteger(paper.getClassid())) {
-            String classIds = classMapper.getClassIds(paper.getTeacherid());//获取教师任教行政和提高班id
+            String classIds = classMapper.getClassIds(paper);//获取教师任教行政和提高班id
             paper.setClassids(classIds);
         }
     }
@@ -361,8 +360,8 @@ public class GuideService {
     public Map listPreviewStuExport(AnalyzeSearchVo paper) {
         Map map = new HashMap();
         Integer schoolid = paper.getSchoolid();
-        TSchool school = schoolMapper.selectByPrimaryKey(schoolid);
-        paper.setYear(school.getYear());
+        //TSchool school = schoolMapper.selectByPrimaryKey(schoolid);
+        //paper.setYear(school.getYear());
         setClassIds(paper);//设置教师权限班级
         Map slist = new HashMap();
         List<AStudentPaperVo> subjects = new ArrayList<>();

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

@@ -30,8 +30,7 @@
     <select id="getClassIds" resultType="java.lang.String">
         select group_concat(distinct c.classid)
         from t_class_teacher ct left join  t_class c on ct.classid=c.classid
-        left join t_school s on ct.schoolid=s.schoolid
-        where ct.teacherid=#{teacherid} and c.year=s.year and c.classstate=1
+        where ct.teacherid=#{paper.teacherid} and c.year=#{paper.year} and c.classstate=1
         and c.classtype in(1,2)
     </select>
 

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

@@ -341,8 +341,12 @@
         left join t_paper_student ps on ps.paperid=pg.paperid and ps.classid=pg.classid
         left join t_class c on pg.classid=c.classid
         where p.paperstate=22 and c.schoolid=#{paper.schoolid} and c.gradeid=#{paper.gradeid} and c.year=#{paper.year}
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(p.createtime,'%Y%m%d'))>=#{paper.starttime}
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(p.createtime,'%Y%m%d'))<=#{paper.stoptime}
+        <if test="paper.starttime!=null and paper.starttime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(p.createtime,'%Y%m%d'))>=#{paper.starttime}
+        </if>
+        <if test="paper.stoptime!=null and paper.stoptime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(p.createtime,'%Y%m%d'))&lt;=#{paper.stoptime}
+        </if>
         <if test="paper.classid!=null and paper.classid!=0">
             and c.classid=#{paper.classid}
         </if>
@@ -377,8 +381,12 @@
         left join t_paper_student ps on ps.studentid=cs.studentid
         left join t_paper_group pg on pg.paperid=ps.paperid and pg.classid=ps.classid
         left join t_paper p on ps.paperid=p.paperid and p.paperstate=22
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(pg.starttime,'%Y%m%d'))>=#{paper.starttime}
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(pg.starttime,'%Y%m%d'))&lt;=#{paper.stoptime}
+        <if test="paper.starttime!=null and paper.starttime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(pg.starttime,'%Y%m%d'))>=#{paper.starttime}
+        </if>
+        <if test="paper.stoptime!=null and paper.stoptime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(pg.starttime,'%Y%m%d'))&lt;=#{paper.stoptime}
+        </if>
         <if test="paper.subjectid!='0'.toString() and paper.subjectid!=''">
             and p.subjectid=#{paper.subjectid}
         </if>
@@ -404,8 +412,12 @@
         left join t_subject s on p.subjectid=s.subjectid
         where ps.studentid=#{paper.studentid} and c.gradeid=#{paper.gradeid} and c.year=#{paper.year} and
         p.paperstate=22
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(pg.starttime,'%Y%m%d'))>=#{paper.starttime}
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(pg.starttime,'%Y%m%d'))&lt;=#{paper.stoptime}
+        <if test="paper.starttime!=null and paper.starttime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(pg.starttime,'%Y%m%d'))>=#{paper.starttime}
+        </if>
+        <if test="paper.stoptime!=null and paper.stoptime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(pg.starttime,'%Y%m%d'))&lt;=#{paper.stoptime}
+        </if>
         <if test="paper.classid!=null and paper.classid!=0">
             and ps.classid=#{paper.classid}
         </if>
@@ -423,8 +435,12 @@
         from t_paper_student ps left join t_class c on ps.classid=c.classid
         left join t_paper p on ps.paperid=p.paperid
         where ps.studentid=#{paper.studentid} and c.gradeid=#{paper.gradeid} and c.year=#{paper.year} and p.paperstate=22
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(p.createtime,'%Y%m%d'))>=#{paper.starttime}
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(p.createtime,'%Y%m%d'))&lt;=#{paper.stoptime}
+        <if test="paper.starttime!=null and paper.starttime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(p.createtime,'%Y%m%d'))>=#{paper.starttime}
+        </if>
+        <if test="paper.stoptime!=null and paper.stoptime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(p.createtime,'%Y%m%d'))&lt;=#{paper.stoptime}
+        </if>
         <if test="paper.classid!=null and paper.classid!=0">
             and ps.classid=#{paper.classid}
         </if>
@@ -442,8 +458,12 @@
         from t_paper_student ps left join t_class c on ps.classid=c.classid
         left join t_paper p on ps.paperid=p.paperid
         where c.schoolid=#{paper.schoolid} and c.gradeid=#{paper.gradeid} and c.year=#{paper.year} and p.paperstate=22
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(p.createtime,'%Y%m%d'))>=#{paper.starttime}
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(p.createtime,'%Y%m%d'))&lt;=#{paper.stoptime}
+        <if test="paper.starttime!=null and paper.starttime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(p.createtime,'%Y%m%d'))>=#{paper.starttime}
+        </if>
+        <if test="paper.stoptime!=null and paper.stoptime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(p.createtime,'%Y%m%d'))&lt;=#{paper.stoptime}
+        </if>
         <if test="paper.classid!=null and paper.classid!=0">
             and ps.classid=#{paper.classid}
         </if>

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

@@ -214,8 +214,12 @@
         from t_paper p left join t_paper_group 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}
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(p.createtime,'%Y%m%d'))>=#{paper.starttime}
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(p.createtime,'%Y%m%d'))<=#{paper.stoptime}
+        <if test="paper.starttime!=null and paper.starttime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(p.createtime,'%Y%m%d'))>=#{paper.starttime}
+        </if>
+        <if test="paper.stoptime!=null and paper.stoptime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(p.createtime,'%Y%m%d'))&lt;=#{paper.stoptime}
+        </if>
         <if test="paper.classid!=null and paper.classid!=0">
             and c.classid=#{paper.classid}
         </if>

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

@@ -158,8 +158,12 @@
         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}
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))>=#{paper.starttime}
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))<=#{paper.stoptime}
+        <if test="paper.starttime!=null and paper.starttime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))>=#{paper.starttime}
+        </if>
+        <if test="paper.stoptime!=null and paper.stoptime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))&lt;=#{paper.stoptime}
+        </if>
         <if test="paper.subjectid!='0'.toString() and paper.subjectid!=''">
             and g.subjectid=#{paper.subjectid}
         </if>
@@ -179,8 +183,12 @@
         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 UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))>=#{paper.starttime}
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))&lt;=#{paper.stoptime}
+        <if test="paper.starttime!=null and paper.starttime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))>=#{paper.starttime}
+        </if>
+        <if test="paper.stoptime!=null and paper.stoptime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))&lt;=#{paper.stoptime}
+        </if>
         <if test="paper.classid!=null and paper.classid!=0">
             and gg.classid=#{paper.classid}
         </if>
@@ -201,8 +209,12 @@
         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
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))>=#{paper.starttime}
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))&lt;=#{paper.stoptime}
+        <if test="paper.starttime!=null and paper.starttime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))>=#{paper.starttime}
+        </if>
+        <if test="paper.stoptime!=null and paper.stoptime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))&lt;=#{paper.stoptime}
+        </if>
         <if test="paper.subjectid!='0'.toString() and paper.subjectid!=''">
             and g.subjectid=#{paper.subjectid}
         </if>
@@ -236,8 +248,12 @@
         group by cs2.studentid)cs
         left join t_guide_group_student ggs on ggs.studentid=cs.studentid
         left join t_guide g on ggs.guideid=g.guideid
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))>=#{paper.starttime}
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))&lt;=#{paper.stoptime}
+        <if test="paper.starttime!=null and paper.starttime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))>=#{paper.starttime}
+        </if>
+        <if test="paper.stoptime!=null and paper.stoptime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))&lt;=#{paper.stoptime}
+        </if>
         <if test="paper.subjectid!='0'.toString() and paper.subjectid!=''">
             and g.subjectid=#{paper.subjectid}
         </if>
@@ -259,8 +275,12 @@
         left join t_guide g on ggs.guideid=g.guideid
         left join t_subject s on g.subjectid=s.subjectid
         where ggs.studentid=#{paper.studentid} and c.gradeid=#{paper.gradeid} and c.year=#{paper.year}
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))>=#{paper.starttime}
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))&lt;=#{paper.stoptime}
+        <if test="paper.starttime!=null and paper.starttime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))>=#{paper.starttime}
+        </if>
+        <if test="paper.stoptime!=null and paper.stoptime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))&lt;=#{paper.stoptime}
+        </if>
         <if test="paper.classid!=0">
             and ggs.classid=#{paper.classid}
         </if>
@@ -278,8 +298,12 @@
         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
         where ggs.studentid=#{paper.studentid} and c.gradeid=#{paper.gradeid} and c.year=#{paper.year}
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))>=#{paper.starttime}
-        and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))&lt;=#{paper.stoptime}
+        <if test="paper.starttime!=null and paper.starttime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))>=#{paper.starttime}
+        </if>
+        <if test="paper.stoptime!=null and paper.stoptime!=0">
+            and UNIX_TIMESTAMP(FROM_UNIXTIME(g.createtime,'%Y%m%d'))&lt;=#{paper.stoptime}
+        </if>
         <if test="paper.classid!=0">
             and ggs.classid=#{paper.classid}
         </if>

suser/src/main/java/com/xhkjedu/suser/service/system/TeacherRoleService.java

@@ -220,8 +220,8 @@ public class TeacherRoleService {
      * @return java.util.List<com.xhkjedu.suser.vo.gradeclass.GradeVo>
      **/
     public List<GradeVo> listGradeClassesByUserid2(TeacherRoleParam role) {
-        Integer year = schoolMapper.getYearByUserId(role.getTeacherid());
-        role.setYear(year);
+        //Integer year = schoolMapper.getYearByUserId(role.getTeacherid());
+        //role.setYear(year);
         return classTeacherMapper.listGradeClassesByUserid2(role);
     }