模块更改终端类型模块角色更改，完善组件数据

sapi/src/main/java/com/xhkjedu/sapi/controller/component/ComponentController.java

@@ -411,4 +411,18 @@ public class ComponentController {
         N_Utils.validation(new Object[]{userid, "用户ID", 1});
         return new ResultVo(0, componentService.listExamCheckProgress(params));
     }
+
+    /*
+     * @Description 作业-我的
+     * @Date 2024/7/25 16:26:17
+     * @Author WN
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/paper_my")
+    public ResultVo listPaperForMy(@RequestBody ComponentParams params) {
+        Integer userid = params.getUserid();
+        N_Utils.validation(new Object[]{userid, "用户ID", 1});
+        return new ResultVo(0, componentService.listPaperForMy(params));
+    }
 }

sapi/src/main/java/com/xhkjedu/sapi/mapper/component/ComponentMapper.java

@@ -23,6 +23,9 @@ public interface ComponentMapper {
     //批改作业
     List<PaperListVo> listCorrectPages(@Param("userid")Integer userid,@Param("schoolid")Integer schoolid,@Param("limitSize")Integer limitSize);
 
+    //作业-我的
+    List<PaperListVo> listPaperForMy(@Param("params")ComponentParams params);
+
     //通知公告
     List<NoticeVo> listNotices(@Param("userid")Integer userid,@Param("limitSize")Integer limitSize);
 
@@ -122,4 +125,5 @@ public interface ComponentMapper {
     List<EPaperVo> listExamCheckProgressPaper(@Param("examid")Integer examid);
     //考试-阅卷进度-学生试题
     List<PaperStudentQuestionVo> listExamCheckProgressStuQuestion(@Param("epids")String epids);
+
 }

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

@@ -90,6 +90,10 @@ public interface ModuleMapper extends TkMapper<TModule> {
      //根据默认模块更改固定值：适用终端、站内应用、应用地址、应用编码、应用描述
     void updateBatchFixed(@Param("module") TModuledefault module);
 
+    //区域更改终端类型时，更改角色模块对应类型
+    void updateBatchBelongcode(@Param("module") TModuledefault module);
 
+    //学校修改终端类型时，更改对应模块角色终端类型
+    void updateBelongcodeByModuleid(@Param("module") TModule module);
 
 }

sapi/src/main/java/com/xhkjedu/sapi/model/notice/TNotice.java

@@ -21,7 +21,7 @@ public class TNotice extends BaseBean {
     //通知标题
     private String noticetitle;
 
-    //通知对象1班级2老师3单个学生4教师学生
+    //通知对象1班级(无)2老师3单个学生4教师学生
     private Integer noticetype;
 
     //创建人

sapi/src/main/java/com/xhkjedu/sapi/service/component/ComponentService.java

@@ -1,7 +1,6 @@
 package com.xhkjedu.sapi.service.component;
 
 import com.alibaba.fastjson.JSON;
-import com.xhkjedu.sapi.mapper.analyze.SchoolPeopleMapper;
 import com.xhkjedu.sapi.mapper.component.ComponentMapper;
 import com.xhkjedu.sapi.mapper.gradeclass.ClassMapper;
 import com.xhkjedu.sapi.mapper.subjectbook.SubjectMapper;
@@ -43,8 +42,6 @@ public class ComponentService {
     private SubjectMapper subjectMapper;
     @Resource
     private ClassMapper classMapper;
-    @Resource
-    SchoolPeopleMapper schoolPeopleMapper;
 
 
     /*
@@ -57,24 +54,45 @@ public class ComponentService {
     public List<PaperListVo> listCorrectPages(Integer userid, Integer limitSize) {
         Integer schoolid = userMapper.getSchoolIdByUserId(userid);
         List<PaperListVo> list = componentMapper.listCorrectPages(userid, schoolid, limitSize);
+        return setPaperListVo(list);
+    }
+
+    /*
+     * @Description 作业-我的
+     * @Date 2024/7/25 16:25:33
+     * @Author WN
+     * @Param [params]
+     * @Return java.util.List<com.xhkjedu.vo.paper.PaperListVo>
+     **/
+    public List<PaperListVo> listPaperForMy(ComponentParams params) {
+        Integer schoolid = userMapper.getSchoolIdByUserId(params.getUserid());
+        params.setSchoolid(schoolid);
+        List<PaperListVo> list = componentMapper.listPaperForMy(params);
+        return setPaperListVo(list);
+    }
+
+    public List<PaperListVo> setPaperListVo(List<PaperListVo> list) {
         for (PaperListVo p : list) {
-            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());
+            if (p.getPaperstate() == 21) {// 未布置
+                p.setClasses(null);
+                p.setChecklist(null);
+            } else {
+                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());
             }
-            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());
-            p.setSchools(null);
         }
-
         return list;
     }
 
@@ -434,23 +452,23 @@ public class ComponentService {
      * @Param [params]
      * @Return void
      **/
-    public Map<String,Object> getClassErrorQuestion(ComponentParams params) {
-        long[] yeartimestamp = ApiUtil.getNowhalfYearTimestamp();//近半年
+    public Map<String, Object> getClassErrorQuestion(ComponentParams params) {
+        long[] yeartimestamp = ApiUtil.getNowhalfYearTimestamp();// 近半年
         params.setStarttime(yeartimestamp[0]);
         params.setStoptime(yeartimestamp[1]);
 
         // 获取当前教师班级最近一次已生成报告作业
         Integer lastError = componentMapper.getClassErrorQuesLastPaper(params);
-        Map<String,Object> map =  componentMapper.getClassErrorQuesAndExplain(params);
-        if(map == null || map.isEmpty()) {
+        Map<String, Object> map = componentMapper.getClassErrorQuesAndExplain(params);
+        if (map == null || map.isEmpty()) {
             map = new HashMap<>();
-            map.put("quesnum",0);
-            map.put("explainnum",0);
+            map.put("quesnum", 0);
+            map.put("explainnum", 0);
         }
-        if(lastError == null){
+        if (lastError == null) {
             lastError = 0;
         }
-        map.put("lasterror",lastError);
+        map.put("lasterror", lastError);
         return map;
     }
 
@@ -461,29 +479,29 @@ public class ComponentService {
      * @Param [params]
      * @Return java.util.Map<java.lang.String,java.lang.Integer>
      **/
-    public Map<String,Integer> getClassForTeacher(ComponentParams params){
+    public Map<String, Integer> getClassForTeacher(ComponentParams params) {
         Integer schoolid = userMapper.getSchoolIdByUserId(params.getUserid());
         params.setSchoolid(schoolid);
-        List<Integer> classids = componentMapper.listClassidsForTeacher(params);//权限班级
+        List<Integer> classids = componentMapper.listClassidsForTeacher(params);// 权限班级
         int classnum = 0;
         int stunum = 0;
         int groupnum = 0;
-        if(classids != null && classids.size() > 0) {
+        if (classids != null && classids.size() > 0) {
             classnum = classids.size();
             String classidsStr = classids.stream()
-                                .map(Object::toString)
-                                .collect(Collectors.joining(","));
-            List<Integer> stuGroups = componentMapper.listClassStuAndGroup(params.getUserid(),classidsStr);
-            if(stuGroups != null && stuGroups.size() > 0) {
+                                         .map(Object::toString)
+                                         .collect(Collectors.joining(","));
+            List<Integer> stuGroups = componentMapper.listClassStuAndGroup(params.getUserid(), classidsStr);
+            if (stuGroups != null && stuGroups.size() > 0) {
                 stunum = stuGroups.get(0);
                 groupnum = stuGroups.get(1);
             }
         }
 
-        Map<String,Integer> map = new HashMap<>();
-        map.put("classnum",classnum);
-        map.put("stunum",stunum);
-        map.put("groupnum",groupnum);
+        Map<String, Integer> map = new HashMap<>();
+        map.put("classnum", classnum);
+        map.put("stunum", stunum);
+        map.put("groupnum", groupnum);
         return map;
     }
 
@@ -494,25 +512,25 @@ public class ComponentService {
      * @Param [params]
      * @Return java.util.Map<java.lang.String,java.lang.Integer>
      **/
-    public Map<String,Integer> getQuestionStatistic(ComponentParams params){
+    public Map<String, Integer> getQuestionStatistic(ComponentParams params) {
         UserVo uservo = userMapper.getUserAndSchoolInfo(params.getUserid());
         params.setSchoolid(uservo.getSchoolid());
         params.setSchoollevel(uservo.getSchoollevel());
 
-        Map<String,Integer> map = componentMapper.getQuestionStatistic(params);
-        if(map == null || map.isEmpty()){
+        Map<String, Integer> map = componentMapper.getQuestionStatistic(params);
+        if (map == null || map.isEmpty()) {
             map = new HashMap<>();
-            map.put("totalnum",0);
-            map.put("todaynum",0);
+            map.put("totalnum", 0);
+            map.put("todaynum", 0);
         }
-        //获取当前学科试题数量
+        // 获取当前学科试题数量
         Integer subjectnum = componentMapper.getQuestionStatisticSubejct(params);
-        if(subjectnum == null){
+        if (subjectnum == null) {
             subjectnum = 0;
         }
-        map.put("subjectnum",subjectnum);
+        map.put("subjectnum", subjectnum);
 
-        return  map;
+        return map;
     }
 
     /*
@@ -522,54 +540,54 @@ public class ComponentService {
      * @Param [params]
      * @Return java.util.Map<java.lang.String,java.lang.Object>
      **/
-    public Map<String,Object> getTeachingStatistic(ComponentParams params){
+    public Map<String, Object> getTeachingStatistic(ComponentParams params) {
         UserVo uservo = userMapper.getUserAndSchoolInfo(params.getUserid());
         params.setSchoolid(uservo.getSchoolid());
         params.setSchoollevel(uservo.getSchoollevel());
         params.setYear(uservo.getYear());
 
-        //近半年
+        // 近半年
         long[] yeartimestamp = ApiUtil.getNowhalfYearTimestamp();
         params.setStarttime(yeartimestamp[0]);
         params.setStoptime(yeartimestamp[1]);
 
         params.setTimestamp(N_Utils.getSecondTimestamp());
 
-        Map<String,Object> map = componentMapper.getTeachingSchoolClassNum(params);//班级总数量
+        Map<String, Object> map = componentMapper.getTeachingSchoolClassNum(params);// 班级总数量
 
-        //作业
+        // 作业
         List<SchoolWorkSubjectVo> lst = componentMapper.listTeachingPapers(params);
         Integer paperTotalnum = 0;
         double paperCommitRate = 0;
         double paperCheckRate = 0;
 
-        if(lst!=null && lst.size()>0){
-            for(SchoolWorkSubjectVo subject : lst){
-                subject.setCommitrate(N_Utils.getIntegerDivideAndMulitiply(subject.getCommitnum(),subject.getStunum()));
-                subject.setCheckrate(N_Utils.getIntegerDivideAndMulitiply(subject.getChecknum(),subject.getCommitnum()));
+        if (lst != null && lst.size() > 0) {
+            for (SchoolWorkSubjectVo subject : lst) {
+                subject.setCommitrate(N_Utils.getIntegerDivideAndMulitiply(subject.getCommitnum(), subject.getStunum()));
+                subject.setCheckrate(N_Utils.getIntegerDivideAndMulitiply(subject.getChecknum(), subject.getCommitnum()));
                 subject.setWorklist(new ArrayList<>());
             }
 
             paperTotalnum = lst.stream().mapToInt(SchoolWorkSubjectVo::getFabunum).sum();
-            Integer totalcommit =  lst.stream().mapToInt(SchoolWorkSubjectVo::getCommitnum).sum();
+            Integer totalcommit = lst.stream().mapToInt(SchoolWorkSubjectVo::getCommitnum).sum();
             Integer totalcheck = lst.stream().mapToInt(SchoolWorkSubjectVo::getChecknum).sum();
             Integer totalstunum = lst.stream().mapToInt(SchoolWorkSubjectVo::getStunum).sum();
-            paperCommitRate  = N_Utils.getIntegerDivideAndMulitiply(totalcommit,totalstunum);
-            if(totalcommit>0){
-                paperCheckRate = N_Utils.getIntegerDivideAndMulitiply(totalcheck,totalcommit);
+            paperCommitRate = N_Utils.getIntegerDivideAndMulitiply(totalcommit, totalstunum);
+            if (totalcommit > 0) {
+                paperCheckRate = N_Utils.getIntegerDivideAndMulitiply(totalcheck, totalcommit);
             }
         }
-        map.put("paperTotalnum",paperTotalnum);
-        map.put("paperCommitRate",paperCommitRate);
-        map.put("paperCheckRate",paperCheckRate);
+        map.put("paperTotalnum", paperTotalnum);
+        map.put("paperCommitRate", paperCommitRate);
+        map.put("paperCheckRate", paperCheckRate);
 
-        //预习
+        // 预习
         List<SchoolWorkSubjectVo> guideList = componentMapper.listTeachingGuides(params);
         Integer guideTotalnum = 0;
         double guideCommitRate = 0;
-        if(guideList!=null && guideList.size()>0){
-            for(SchoolWorkSubjectVo subject : guideList){
-                subject.setCommitrate(N_Utils.getIntegerDivideAndMulitiply(subject.getCommitnum(),subject.getStunum()));
+        if (guideList != null && guideList.size() > 0) {
+            for (SchoolWorkSubjectVo subject : guideList) {
+                subject.setCommitrate(N_Utils.getIntegerDivideAndMulitiply(subject.getCommitnum(), subject.getStunum()));
 
                 subject.setWorklist(new ArrayList<>());
             }
@@ -577,14 +595,14 @@ public class ComponentService {
             guideTotalnum = lst.stream().mapToInt(SchoolWorkSubjectVo::getFabunum).sum();
             Integer totalstunum = lst.stream().mapToInt(SchoolWorkSubjectVo::getStunum).sum();
             Integer totalcommit = lst.stream().mapToInt(SchoolWorkSubjectVo::getCommitnum).sum();
-            if(totalcommit>0){
-                guideCommitRate = N_Utils.getIntegerDivideAndMulitiply(totalcommit,totalstunum);
+            if (totalcommit > 0) {
+                guideCommitRate = N_Utils.getIntegerDivideAndMulitiply(totalcommit, totalstunum);
             }
         }
-        map.put("guideTotalnum",guideTotalnum);
-        map.put("guideCommitRate",guideCommitRate);
+        map.put("guideTotalnum", guideTotalnum);
+        map.put("guideCommitRate", guideCommitRate);
 
-        //背诵
+        // 背诵
         // List<SchoolWorkSubjectVo> reciteList = componentMapper.listTeachingRecites(params);
         // int reciteTotalnum = 0;
         // double reciteCommitRate = 0;
@@ -604,7 +622,7 @@ public class ComponentService {
         // map.put("reciteTotalnum",reciteTotalnum);
         // map.put("reciteCommitRate",reciteCommitRate);
 
-        return  map;
+        return map;
     }
 
     /*
@@ -614,7 +632,7 @@ public class ComponentService {
      * @Param [params]
      * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
      **/
-    public List<Map<String,Object>> listUserModules(ComponentParams params){
+    public List<Map<String, Object>> listUserModules(ComponentParams params) {
         return componentMapper.listUserModules(params);
     }
 
@@ -625,7 +643,7 @@ public class ComponentService {
      * @Param [params]
      * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
      **/
-    public List<Map<String,Object>> listExamPaperGiv(ComponentParams params){
+    public List<Map<String, Object>> listExamPaperGiv(ComponentParams params) {
         params.setTodayDatetime(LocalDateTime.now());
         return componentMapper.listExamPaperGiv(params);
     }
@@ -637,7 +655,7 @@ public class ComponentService {
      * @Param [params]
      * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
      **/
-    public List<Map<String,Object>> listExamPaperCheck(ComponentParams params){
+    public List<Map<String, Object>> listExamPaperCheck(ComponentParams params) {
         return componentMapper.listExamPaperCheck(params);
     }
 
@@ -648,16 +666,16 @@ public class ComponentService {
      * @Param [params]
      * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
      **/
-    public List<Map<String,Object>> listExamInvigilate(ComponentParams params){
+    public List<Map<String, Object>> listExamInvigilate(ComponentParams params) {
         params.setTodayDatetime(LocalDateTime.now());
         Integer schoolid = userMapper.getSchoolIdByUserId(params.getUserid());
 
-        List<Map<String,Object>> list = componentMapper.listExamInvigilate(params);
+        List<Map<String, Object>> list = componentMapper.listExamInvigilate(params);
         for (Map map : list) {
             List<Map> classes = JSON.parseArray(map.get("classnames").toString(), Map.class);
             List<Map> classList = new ArrayList<>();
             Integer majored = (Integer) map.get("majored");
-            if (majored == 1) {//主监考
+            if (majored == 1) {// 主监考
                 classList.addAll(classes);
             } else {
                 String[] classids2 = map.get("classids").toString().split(",");
@@ -686,7 +704,7 @@ public class ComponentService {
                 schools.add(school);
             }
             if (schools.size() > 1) {
-                //把本校放在第一个位置
+                // 把本校放在第一个位置
                 for (int i = 0; i < schools.size(); i++) {
                     Map rtnMap = schools.get(i);
                     Integer schoolid2 = Integer.parseInt(rtnMap.get("schoolid").toString());
@@ -709,27 +727,25 @@ public class ComponentService {
      * @Param [params]
      * @Return java.util.Map<java.lang.String,java.lang.Object>
      **/
-    public Map<String,Object> getExamReportSchool(ComponentParams params){
+    public Map<String, Object> getExamReportSchool(ComponentParams params) {
         Integer schoolid = userMapper.getSchoolIdByUserId(params.getUserid());
-        //获取最新近一次有报告的考试
-        Map<String,Object> map = componentMapper.getExamReportSchoolBase(schoolid);
-        if(map!=null && !map.isEmpty()){
-            Integer examid = Integer.parseInt(map.get("examid").toString());
-            List<Map<String,Object>> subjects = componentMapper.listExamReportSchoolStatistic(examid);
-            map.put("subjects",subjects);
-        }else {
-            map = new HashMap<>();
-            map.put("classnum", 0);
-            map.put("stunum", 0);
-            map.put("missnum", 0);
-            map.put("subjectnum", 0);
-            map.put("maxscore", 0);
-            map.put("avgscore", 0);
-            map.put("mixscore", 0);
-
-            map.put("subjects",new ArrayList<>());
+        // 获取最新近一次有报告的考试
+        Map<String, Object> map = componentMapper.getExamReportSchoolBase(schoolid);
+        if (map != null && !map.isEmpty()) {
+            Integer examstate = Integer.parseInt(map.get("examstate").toString());
+            if (examstate == 3) {
+                Integer examid = Integer.parseInt(map.get("examid").toString());
+                List<Map<String, Object>> subjects = componentMapper.listExamReportSchoolStatistic(examid);
+                map.put("subjects", subjects);
+                return map;
+            } else {
+                return null;
+            }
+
+        } else {
+            return null;
         }
-        return map;
+
     }
 
     /*
@@ -739,44 +755,40 @@ public class ComponentService {
      * @Param [params]
      * @Return java.util.Map<java.lang.String,java.lang.Object>
      **/
-    public Map<String,Object> getExamReportClass(ComponentParams params){
+    public Map<String, Object> getExamReportClass(ComponentParams params) {
         Integer schoolid = userMapper.getSchoolIdByUserId(params.getUserid());
         params.setSchoolid(schoolid);
 
-        Map<String,Object> map = new HashMap<>();
         ExamInfoVo examInfoVo = componentMapper.getExamReportClassInfo(params);
-        if(examInfoVo != null){
-            params.setSubjectid("zf");
-            params.setClassid(examInfoVo.getClassid());
-            params.setShowrank(examInfoVo.getTeashowrank());
-            params.setExamid(examInfoVo.getExamid());
+        if (examInfoVo != null) {
+            if(examInfoVo.getExamstate() == 3){
+                params.setSubjectid("zf");
+                params.setShowrank(examInfoVo.getTeashowrank());
+                params.setExamid(examInfoVo.getExamid());
+                if (!N_Utils.isTrueInteger(params.getClassid())) {
+                    params.setClassid(examInfoVo.getClassid());
+                }
 
-            map = componentMapper.getExamReportSingleBase(params);
+                Map<String, Object>  map = componentMapper.getExamReportSingleBase(params);
 
-            //获取考试关联的班级信息
-            List<Map<String,Object>> classList = componentMapper.listExamReportClass(examInfoVo.getExamid(),params.getUserid());
-            map.put("classlist",classList);
+                // 获取考试关联的班级信息
+                List<Map<String, Object>> classList = componentMapper.listExamReportClass(examInfoVo.getExamid(), params.getUserid());
+                map.put("classlist", classList);
 
 
-            List<Map<String,Object>> subjectList = new ArrayList<>();
-            if(examInfoVo.getTeashowrank() == 3){
-                subjectList = componentMapper.listExamReportClassScore(params);
+                List<Map<String, Object>> subjectList = new ArrayList<>();
+                if (examInfoVo.getTeashowrank() == 3) {
+                    subjectList = componentMapper.listExamReportClassScore(params);
+                }
+                map.put("subjectlist", subjectList);
+                map.put("teashowrank", examInfoVo.getTeashowrank());
+                return map;
+            }else{
+                return null;
             }
-            map.put("subjectlist",subjectList);
-        }else{
-            map = new HashMap<>();
-            map.put("classlist", new ArrayList<>());
-            map.put("subjectlist", new ArrayList<>());
-            map.put("yxrate", 0);
-            map.put("jgrate", 0);
-            map.put("classmaxscore", 0);
-            map.put("classavgscore", 0);
-            map.put("classavgscorerank", 0);
-            map.put("schoolmaxscore", 0);
-            map.put("schoolavgscore", 0);
+        } else {
+            return null;
         }
-
-        return map;
     }
 
     /*
@@ -786,44 +798,42 @@ public class ComponentService {
      * @Param [params]
      * @Return java.util.Map<java.lang.String,java.lang.Object>
      **/
-    public Map<String,Object> getExamReportSingle(ComponentParams params){
+    public Map<String, Object> getExamReportSingle(ComponentParams params) {
         Integer schoolid = userMapper.getSchoolIdByUserId(params.getUserid());
         params.setSchoolid(schoolid);
 
-        Map<String,Object> map = new HashMap<>();
         ExamInfoVo examInfoVo = componentMapper.getExamReportSingleInfo(params);
 
-        if(examInfoVo != null){
-            params.setSubjectid(examInfoVo.getSubjectid());
-            params.setClassid(examInfoVo.getClassid());
-            params.setShowrank(examInfoVo.getTeashowrank());
-            params.setExamid(examInfoVo.getExamid());
+        if (examInfoVo != null) {
+            if(examInfoVo.getExamstate() == 3){
+                params.setSubjectid(examInfoVo.getSubjectid());
+                params.setShowrank(examInfoVo.getTeashowrank());
+                params.setExamid(examInfoVo.getExamid());
 
-            map = componentMapper.getExamReportSingleBase(params);
+                if (!N_Utils.isTrueInteger(params.getClassid())) {
+                    params.setClassid(examInfoVo.getClassid());
+                }
 
-            //获取考试关联的班级信息
-            List<Map<String,Object>> classList = componentMapper.listExamReportClass(examInfoVo.getExamid(),params.getUserid());
-            map.put("classlist",classList);
+                Map<String, Object> map = componentMapper.getExamReportSingleBase(params);
 
-            List<Map<String,Object>> rankList = new ArrayList<>();
-            if(examInfoVo.getTeashowrank() == 3){
-                rankList = componentMapper.listExamReportSingleRank(params);
+                // 获取考试关联的班级信息
+                List<Map<String, Object>> classList = componentMapper.listExamReportClass(examInfoVo.getExamid(), params.getUserid());
+                map.put("classlist", classList);
+
+                List<Map<String, Object>> rankList = new ArrayList<>();
+                if (examInfoVo.getTeashowrank() == 3) {
+                    rankList = componentMapper.listExamReportSingleRank(params);
+                }
+                map.put("ranklist", rankList);
+                map.put("teashowrank", examInfoVo.getTeashowrank());
+                return map;
+            }else{
+                return null;
             }
-            map.put("ranklist",rankList);
-        }else{
-            map = new HashMap<>();
-            map.put("classlist", new ArrayList<>());
-            map.put("ranklist", new ArrayList<>());
-            map.put("yxrate", 0);
-            map.put("jgrate", 0);
-            map.put("classmaxscore", 0);
-            map.put("classavgscore", 0);
-            map.put("classavgscorerank", 0);
-            map.put("schoolmaxscore", 0);
-            map.put("schoolavgscore", 0);
-        }
 
-        return map;
+        } else {
+            return null;
+        }
     }
 
     /*
@@ -833,43 +843,43 @@ public class ComponentService {
      * @Param [params]
      * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
      **/
-    public List<Map<String,Object>> listExamCheckProgress(ComponentParams params){
+    public List<Map<String, Object>> listExamCheckProgress(ComponentParams params) {
         UserVo userVo = userMapper.getUserAndSchoolInfo(params.getUserid());
         params.setSchoolid(userVo.getSchoolid());
         params.setUsertype(userVo.getUsertype());
-        //获取最新的一个考试阅卷
+        // 获取最新的一个考试阅卷
         ExamInfoVo examInfoVo = componentMapper.getExamCheckProgressBase(params);
-        List<Map<String,Object>> mapList = new ArrayList<>();
+        List<Map<String, Object>> mapList = new ArrayList<>();
 
-        if(examInfoVo!=null){
+        if (examInfoVo != null) {
             List<EPaperVo> papers = componentMapper.listExamCheckProgressPaper(examInfoVo.getExamid());
             String epids = papers.stream().map(p -> p.getEpid().toString()).collect(Collectors.joining(","));
-            List<PaperStudentQuestionVo> questions = componentMapper.listExamCheckProgressStuQuestion(epids);//获取考试学生试题
+            List<PaperStudentQuestionVo> questions = componentMapper.listExamCheckProgressStuQuestion(epids);// 获取考试学生试题
 
             for (EPaperVo paper : papers) {
-                //单科统计
+                // 单科统计
                 Integer epid = paper.getEpid();
                 List<PaperStudentQuestionVo> qlist =
                         questions.stream().filter(q -> q.getEpid().equals(epid)).collect(Collectors.toList());
 
                 List<Integer> qtlist = qlist.stream().filter(q -> !N_Utils.isObjectiveQuestion(q.getCtype()))
                                             .map(q -> q.getQorder()).distinct().collect(Collectors.toList());
-                List<PaperStudentQuestionVo> zdlist =//作答集合
+                List<PaperStudentQuestionVo> zdlist =// 作答集合
                         qlist.stream().filter(q -> q.getAnswered().equals(1)).collect(Collectors.toList());
-                List<PaperStudentQuestionVo> pylist =//批阅集合
+                List<PaperStudentQuestionVo> pylist =// 批阅集合
                         zdlist.stream().filter(q -> q.getChecked().equals(2)).collect(Collectors.toList());
                 Integer zgtnum = qtlist.size();
                 Integer stunum = zdlist.stream().map(q -> q.getStudentid()).distinct().collect(Collectors.toList()).size();
-                Integer zpynum = pylist.size();//试卷批阅试题数量
+                Integer zpynum = pylist.size();// 试卷批阅试题数量
 
-                Map<String,Object> map = new LinkedHashMap<>();
+                Map<String, Object> map = new LinkedHashMap<>();
 
-                map.put("subjectid",paper.getSubjectid());
-                map.put("subjectname",paper.getSubjectname());
-                map.put("examnum",examInfoVo.getExamnum());
-                map.put("stunum",stunum);//实际人数
-                map.put("zgtnum",zgtnum);//主观题数量
-                map.put("pyrate",N_Utils.getIntegerDivideAndMulitiply(zpynum, zdlist.size()));//批阅进度
+                map.put("subjectid", paper.getSubjectid());
+                map.put("subjectname", paper.getSubjectname());
+                map.put("examnum", examInfoVo.getExamnum());
+                map.put("stunum", stunum);// 实际人数
+                map.put("zgtnum", zgtnum);// 主观题数量
+                map.put("pyrate", N_Utils.getIntegerDivideAndMulitiply(zpynum, zdlist.size()));// 批阅进度
 
                 mapList.add(map);
             }

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

@@ -74,7 +74,14 @@ public class ModuleService {
         TModule original=moduleMapper.selectByPrimaryKey(module.getModuleid());
         if(original!=null && original.getSourcetype() ==2){
             module.setDefaultbcode(module.getBelongcode());
+
+            //判断是否更改belongcode
+            if(module != null && !original.getBelongcode().equals(module.getBelongcode())){
+                moduleMapper.updateBelongcodeByModuleid(module);
+            }
+
         }
+
         return moduleMapper.updateByPrimaryKeySelective(module);
     }
 

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

@@ -124,6 +124,11 @@ public class ModuledefaultService {
 
             //直接覆盖所有学校：适用终端、站内应用、应用地址、应用编码、应用描述
             moduleMapper.updateBatchFixed(model);
+
+            //区域更改终端类型时，更改模块对应的t_role_module对应belongcode
+            if(!originModule.getBelongcode().equals(model.getBelongcode())){
+                moduleMapper.updateBatchBelongcode(model);
+            }
         }
 
         moduledefaultMapper.updateByPrimaryKeySelective(model);//更新默认模块信息

sapi/src/main/java/com/xhkjedu/sapi/vo/component/ExamInfoVo.java

@@ -29,4 +29,7 @@ public class ExamInfoVo {
 
     //计划考试人数
     private Integer examnum;
+
+    //考试状态0未开始1已开始2已结束3已生成报告
+    private Integer examstate;
 }

sapi/src/main/resources/mapper/component/ComponentMapper.xml

@@ -28,6 +28,14 @@
         <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"
+                    select="listPaperCheckStu" column="{paperid=paperid,checktype=checktype,logschoolid=logschoolid,classids=classids}">
+            <result property="userid" column="userid"/>
+            <result property="username" column="username"/>
+            <result property="classid" column="classid"/>
+            <result property="classname" column="classname"/>
+            <result property="gradeid" column="gradeid"/>
+        </collection>
     </resultMap>
     <resultMap id="classResult" type="java.util.Map">
         <result property="schoolid" column="schoolid"/>
@@ -46,18 +54,21 @@
             <result property="checked" column="checked"/>
         </collection>
     </resultMap>
-    <select id="listCorrectPages" resultMap="paperResult">
-        select p.paperid,p.papername,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createtime,p.schoolid,p.hasreport,p.timetype,p.hashb
-             ,#{schoolid} as logschoolid,u.username createname,pg.starttime,pg.stoptime,pg.showtype,p.papernum,p.createid,#{userid} as checkid
-             ,group_concat(pg.classid) classids,p.aftercommit
-        from t_paper p left join t_user u on p.createid=u.userid
-                       left join t_paper_class pg on p.paperid=pg.paperid
-                       left join t_paper_student ps on p.paperid=ps.paperid and pg.classid=ps.classid
-                       left join t_director d on p.directorid=d.directorid
-        where p.deleted=0 and (d.disabled=0 or p.directorid is null)
-          and (p.createid=#{userid} or ps.checkid=#{userid}) and ps.psstate in(1,2,4) and ps.pschecked!=1
-        group by p.paperid order by p.createtime desc limit #{limitSize}
-    </select>
+    <resultMap id="checkUserResult" type="java.util.Map">
+        <result property="schoolid" column="schoolid"/>
+        <result property="schoolname" column="schoolname"/>
+        <result property="checktype" column="checktype"/>
+        <collection property="classes" ofType="java.util.Map" javaType="java.util.List">
+            <result property="schoolid" column="schoolid"/>
+            <result property="classid" column="classid"/>
+            <result property="classname" column="classname"/>
+            <result property="gradeid" column="gradeid"/>
+            <collection property="users" ofType="java.util.Map" javaType="java.util.List">
+                <result property="userid" column="userid"/>
+                <result property="username" column="username"/>
+            </collection>
+        </collection>
+    </resultMap>
     <select id="listClass" resultMap="classResult">
         select count(*) as classnum,ps.classid,c.classname,c.gradeid,c.schoolid,s.schoolname
         ,count(distinct if(ps.psstate in(1,2,4), ps.psid, null))ytjnum
@@ -71,6 +82,62 @@
         group by ps.classid
         order by if(s.schoolid=#{logschoolid},0,s.schoolid),c.gradeid,c.classtype,c.classorder
     </select>
+    <select id="listPaperCheckStu" resultMap="checkUserResult">
+        <if test="checktype==1">
+            select pg.checkid as 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}
+            <if test="classids!=null and classids!=''">
+                and pg.classid in(${classids})
+            </if>
+            order by if(s.schoolid=#{logschoolid},0,s.schoolid),c.gradeid,c.classtype,c.classorder,convert(u.username using gbk)
+        </if>
+        <if test="checktype==3">
+            select ps.checkid as 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}
+            <if test="classids!=null and classids!=''">
+                and ps.classid in(${classids})
+            </if>
+            group by ps.classid,ps.checkid
+            order by if(s.schoolid=#{logschoolid},0,s.schoolid),c.gradeid,c.classtype,c.classorder,convert(u.username using gbk)
+        </if>
+        <if test="checktype!=1 and checktype!=3">
+            select checktype from t_paper where paperid=#{paperid}
+        </if>
+    </select>
+    <select id="listCorrectPages" resultMap="paperResult">
+        select p.paperid,p.papername,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createtime,p.schoolid,p.hasreport,p.timetype,p.hashb
+        ,#{schoolid} as logschoolid,u.username createname,pg.starttime,pg.stoptime,pg.showtype,p.papernum,p.createid,#{userid} as checkid
+        ,group_concat(pg.classid) classids,p.aftercommit
+        from t_paper p left join t_user u on p.createid=u.userid
+        left join t_paper_class pg on p.paperid=pg.paperid
+        left join t_paper_student ps on p.paperid=ps.paperid and pg.classid=ps.classid
+        left join t_director d on p.directorid=d.directorid
+        where p.deleted=0 and (d.disabled=0 or p.directorid is null)
+        and (p.createid=#{userid} or ps.checkid=#{userid}) and ps.psstate in(1,2,4) and ps.pschecked!=1
+        group by p.paperid order by p.createtime desc limit #{limitSize}
+    </select>
+
+    <!--作业-我的-->
+    <select id="listPaperForMy" resultMap="paperResult">
+        select p.paperid,p.papername,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createtime,p.schoolid,p.hasreport,p.timetype,p.hashb,
+        #{params.schoolid} logschoolid,u.username createname,pg.starttime,pg.stoptime,pg.showtype,p.papernum,p.createid,#{params.userid} as checkid
+        ,group_concat(pg.classid) classids,p.aftercommit
+        from t_paper p left join t_user u on p.createid=u.userid
+        left join t_paper_class pg on p.paperid=pg.paperid
+        left join t_director d on p.directorid=d.directorid
+        where p.deleted=0 and p.createid=#{params.userid} and (d.disabled=0 or p.directorid is null)
+        group by p.paperid
+        <!--<if test="params.psstate==0 || params.psstate==1">-->
+        <!--    having min(pg.checked)=#{params.psstate}-->
+        <!--</if>-->
+        order by p.createtime desc,p.paperid desc limit #{params.limitSize}
+    </select>
 
     <!--通知公告-->
     <select id="listNotices" resultType="com.xhkjedu.sapi.vo.notice.NoticeVo">
@@ -110,7 +177,7 @@
         left join t_director d on rd.directorid=d.directorid
         left join t_teacher_powersb p on p.teacherid=r.createid and p.lsbid=d.lsbid
         where r.resourcestate=1 and r.`level`=1 and d.disabled=0
-        and (r.belong in(1,2) or (r.belong in(3,10) and r.schoolid=#{schoolid}) or (r.belong=4 and r.createid=#{userid}) )
+        and (r.belong in(1,2) or (r.belong in(3,10) and r.schoolid=#{schoolid}) or (r.belong=4 and r.createid=#{userid}))
         group by r.resourceid order by r.createtime desc limit #{limitSize}
     </select>
 
@@ -122,7 +189,7 @@
         left join t_director d on rd.directorid=d.directorid
         left join t_teacher_powersb p on p.teacherid=r.createid and p.lsbid=d.lsbid
         where r.resourcestate=1 and r.`level`=4 and d.disabled=0 and r.resourcetype=5
-        and (r.belong in(1,2) or (r.belong in(3,10) and r.schoolid=#{schoolid}) or (r.belong=4 and r.createid=#{userid}) )
+        and (r.belong in(1,2) or (r.belong in(3,10) and r.schoolid=#{schoolid}) or (r.belong=4 and r.createid=#{userid}))
         group by r.resourceid order by r.createtime desc limit #{limitSize}
     </select>
 
@@ -144,7 +211,7 @@
         ,count(DISTINCT gs.rgsid) totalnum,
         count(DISTINCT(if(gs.readtime is not null,gs.rgsid,null))) commitnum
         from t_guide g
-        left join t_guide_group_student gs on g.guideid=gs.guideid and g.schoolid=gs.schoolid
+        left join t_guide_group_student gs on g.guideid=gs.guideid
         left join t_director d on g.directorid=d.directorid
         left join t_teacher_powersb p on p.teacherid=g.createid and p.lsbid=g.lsbid
         where d.disabled=0 and g.createid=#{userid}
@@ -160,11 +227,11 @@
     <!--背诵-->
     <select id="listReciteds" resultType="java.util.Map">
         select r.reciteid,r.recitetitle,r.subjectid,r.createid,r.createtime,r.recitestate,r.recitecont
-        ,rg.starttime,rg.stoptime,count(DISTINCT rs.rsid) totalnum,
+        ,r.schoolid,r.hashb,rg.starttime,rg.stoptime,count(DISTINCT rs.rsid) totalnum,
         count(DISTINCT(if (rs.rsstate>0,rs.rsid,null))) commitnum
         from t_recite r left join t_recite_group rg on r.reciteid=rg.reciteid
-        left join t_recite_student rs on r.reciteid=rs.reciteid and r.schoolid=rs.schoolid
-        where r.createid=#{userid} and r.recitestate=22 group by r.reciteid order by r.createtime desc limit #{limitSize}
+        left join t_recite_student rs on r.reciteid=rs.reciteid
+        where r.createid=#{userid} group by r.reciteid order by r.createtime desc limit #{limitSize}
     </select>
 
     <!--课堂回顾-->
@@ -315,14 +382,16 @@
         count(DISTINCT(if(DATE(FROM_UNIXTIME(q.createtime)) = CURDATE(),q.questionid,null))) todaynum
         from t_question q
         left join t_subject s on q.subjectid=s.subjectid and s.`level`=#{params.schoollevel}
-        where q.belong and (q.belong in(1,2) or (q.belong in(3,10) and q.schoolid=#{params.schoolid})) and q.qlevel &lt; 3
+        where q.belong and (q.belong in(1,2) or (q.belong in(3,10) and q.schoolid=#{params.schoolid}) or (r.belong=4 and r.createid=#{params.userid}))
+        and q.qlevel &lt; 3
     </select>
     <!--校本题库-当前学科试题数量-->
     <select id="getQuestionStatisticSubejct" resultType="java.lang.Integer">
         select count(DISTINCT q.questionid) subjectnum
         from t_question q
         left join t_teacher_powersb tp on q.subjectid = tp.subjectid
-        where tp.teacherid=#{params.userid} and q.belong and (q.belong in(1,2) or (q.belong in(3,10) and q.schoolid=#{params.schoolid})) and q.qlevel &lt; 3
+        where tp.teacherid=#{params.userid}
+        and q.belong and (q.belong in(1,2) or (q.belong in(3,10) and q.schoolid=#{params.schoolid}) or (r.belong=4 and r.createid=#{params.userid})) and q.qlevel &lt; 3
     </select>
 
     <!--教学统计-班级学生教师数量-->
@@ -390,7 +459,7 @@
     <select id="listExamPaperGiv" resultType="java.util.Map">
         select es.esid,es.subjectid,es.subjectname,es.sdate,es.begintime,es.endtime,es.teacherid,u2.username as teachername,
         es.esstate ,ep.epid,ep.ptype,ep.pnum,ep.pscore,ep.answered,ep.handleid,u.username as handlename,
-        ep.scantronpdf,es.examid,e.examname,e.examtype,e.exammode,e.examstate,e.hashb,e.schoolid
+        ep.scantronpdf,es.examid,e.examname,e.examtype,e.exammode,e.examstate,e.gradeid,e.hashb,e.schoolid
         from e_subject es left join e_paper ep on es.esid=ep.esid
         left join e_base e on es.examid=e.examid
         left join t_user u on ep.handleid=u.userid
@@ -447,8 +516,8 @@
     </select>
     <!--考试-校级报告-获取最近一次生成报告的考试-->
     <select id="getExamReportSchoolBase" resultType="java.util.Map">
-        select re.*  from e_base e left join e_rbase re on e.examid=re.examid
-        where e.schoolid=#{schoolid} and e.deleted=1 and e.examstate=3 order by examdate desc limit 1
+        select re.*,e.teashowrank,e.examstate from e_base e left join e_rbase re on e.examid=re.examid
+        where e.schoolid=#{schoolid} and e.deleted=1 order by examdate desc limit 1
     </select>
     <!--考试-校级报告-成绩概况-->
     <select id="listExamReportSchoolStatistic" resultType="java.util.Map">
@@ -467,11 +536,11 @@
 
     <!--考试-班级报告-考试信息-->
     <select id="getExamReportClassInfo" resultType="com.xhkjedu.sapi.vo.component.ExamInfoVo">
-        select e.examid,e.teashowrank,c.classid,c.classname
+        select e.examid,e.teashowrank,e.examstate,c.classid,c.classname
         from e_base e left join e_class c on e.examid=c.examid
         left join t_class_teacher ct on c.classid=ct.classid
-        where e.examstate=3 and e.deleted=1 and ct.teacherid=#{params.userid} and c.schoolid=#{params.schoolid}
-        group by e.examid order by e.examdate desc limit 1
+        where e.deleted=1 and c.schoolid=#{params.schoolid} and ct.teacherid=#{params.userid}
+        group by e.examid order by e.examdate desc,e.examid desc,c.ecid limit 1
     </select>
     <!--考试-班级报告-学科成绩对比-->
     <select id="listExamReportClassScore" resultType="java.util.Map">
@@ -487,14 +556,14 @@
     </select>
     <!--考试-单科报告-单科考试信息-->
     <select id="getExamReportSingleInfo" resultType="com.xhkjedu.sapi.vo.component.ExamInfoVo">
-        select e.examid,e.teashowrank,e.stushowrank,s.subjectid,c.classid from e_base e
+        select e.examid,e.teashowrank,e.stushowrank,e.examstate,s.subjectid,c.classid from e_base e
         left join e_subject s on e.examid=s.examid
         left join t_teacher_powersb tp on tp.teacherid=#{params.userid} and tp.subjectid=s.subjectid
         left join e_class c on e.examid=c.examid
         left join t_class_teacher ct on c.classid=ct.classid and tp.teacherid=ct.teacherid
-        where e.examstate=3 and e.deleted=1 and ct.teacherid=#{params.userid}
-        and c.schoolid=#{params.schoolid}
-        group by e.examid order by e.examdate desc,e.examid desc limit 1
+        where e.deleted=1 and c.schoolid=#{params.schoolid} and ct.teacherid=#{params.userid}
+
+        group by e.examid order by e.examdate desc,e.examid desc,c.ecid limit 1
     </select>
     <!--考试-单科报告-单科概况-->
     <select id="getExamReportSingleBase" resultType="java.util.Map">

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

@@ -119,4 +119,14 @@
         update t_module set belongcode=#{module.belongcode},minout=#{module.minout},moduleurl=#{module.moduleurl},
         mabbrevname=#{module.mabbrevname},comm=#{module.comm},defaultbcode=#{module.belongcode} where defaultid=#{module.moduleid}
     </update>
+    <!--区域更改终端类型时，更改角色模块对应类型-->
+    <update id="updateBatchBelongcode">
+        update t_role_module rm,t_module m set rm.belongcode=#{module.belongcode}
+        where rm.moduleid=m.moduleid and m.defaultid=#{module.moduleid}
+    </update>
+
+    <!--学校修改终端类型时，更改对应模块角色终端类型-->
+    <update id="updateBelongcodeByModuleid">
+        update t_role_module set belongcode=#{module.belongcode} where moduleid=#{module.moduleid}
+    </update>
 </mapper>

sexam/src/main/java/com/xhkjedu/sexam/service/paper/EPaperQtypeService.java

@@ -826,6 +826,24 @@ public class EPaperQtypeService {
                 List<Integer> eptqids = changelist.stream().map(EPaperQtypeQuestion::getEptqid).collect(Collectors.toList());
                 ePaperStudentQuestionMapper.updateBatchStuQuesNeeddeal(epid,eptqids);//批量设置学生提交试题为需要批改试题
             }
+
+            //判断答案中是否包含附件
+            List<EPaperFile> pfiles = ePaper.getPfiles();
+            if(N_Utils.isListNotEmpty(pfiles)){
+                //说明上传答案附件,先清空
+                ePaperFileMapper.delAnswerFile(epid);
+                Integer timestamp = N_Utils.getSecondTimestamp();
+                for(int i=0;i<pfiles.size(); i++){
+                    EPaperFile pfile = pfiles.get(i);
+                    pfile.setEpid(epid);
+                    pfile.setFileorder(i+1);
+                    pfile.setFileclass(2);
+                    pfile.setCreateid(ePaper.getHandleid());
+                    pfile.setCreatetime(timestamp);
+                }
+                ePaperFileMapper.insertList(pfiles);
+            }
+
         }catch (Exception e){
             log.error("保存试卷答案失败："+e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();