作业报告班级

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

@@ -158,8 +158,9 @@ public class PaperAnalyzeController {
     public ResultVo paperClass(@RequestBody TPaper paper){
         Integer paperid = paper.getPaperid();
         Integer schoolid = paper.getSchoolid();
-        N_Utils.validation(new Object[]{paperid,"作业id",1,schoolid,"学校id",1});
-        List<Map> list = paperAnalyzeService.listPaperClass(paperid,schoolid);
+        Integer createid = paper.getCreateid();
+        N_Utils.validation(new Object[]{paperid,"作业id",1,schoolid,"学校id",1,createid,"用户id",1});
+        List<Map> list = paperAnalyzeService.listPaperClass(paperid,schoolid,createid);
         return new ResultVo(0,"获取作业班级列表成功",list);
     }
 

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/paper/PaperAnalyzeMapper.java

@@ -192,7 +192,8 @@ public interface PaperAnalyzeMapper extends TkMapper<TPaperAnalyze> {
      * @Date 2020/9/23 16:58
      * @return java.util.List<com.xhkjedu.vo.gradeclass.ClassVo>
      **/
-    List<Map> listPaperClass(Integer paperid, Integer schoolid);
+    List<Map> listPaperClass(@Param("paperid") Integer paperid,@Param("schoolid") Integer schoolid
+            ,@Param("classids") String classids);
 
     /**
      * 作业班级学生列表

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

@@ -1,6 +1,7 @@
 package com.xhkjedu.sstudy.service.gradeclass;
 
 import com.xhkjedu.sstudy.mapper.gradeclass.ClassMapper;
+import com.xhkjedu.sstudy.utils.StudyUtil;
 import com.xhkjedu.utils.N_Utils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -30,21 +31,6 @@ public class ClassService {
         //获取教师权限下班级包含集团校
         List<Map> classlist = classMapper.listQxClassByTeacherid(teacherid, year);
 
-        //所有权限班级集合
-        List<Integer> classidlist = classlist.stream().map(s -> Integer.parseInt(s.get("classid").toString())).collect(Collectors.toList());
-        //本校班级集合
-        List<Integer> bxclassidlist = classlist.stream().filter(c -> c.get("schoolid").equals(c.get("userschoolid")))
-                                               .map(s -> Integer.parseInt(s.get("classid").toString())).collect(Collectors.toList());
-
-        String classids = StringUtils.join(classidlist, ",");
-        String bxclassids = StringUtils.join(bxclassidlist,",");
-        if(N_Utils.isEmpty(classids)) classids = "0";
-        if(N_Utils.isEmpty(bxclassids)) bxclassids = "0";
-
-        Map rtnmap = new HashMap();
-        rtnmap.put("classids",classids);
-        rtnmap.put("bxclassids",bxclassids);
-
-        return rtnmap;
+        return StudyUtil.setQxClass(classlist);
     }
 }

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

@@ -16,7 +16,6 @@ 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;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -31,9 +30,9 @@ import java.util.stream.Collectors;
  **/
 @Service
 public class PaperAnalyzeService {
-    @Autowired
+    @Resource
     private PaperAnalyzeMapper paperAnalyzeMapper;
-    @Autowired
+    @Resource
     private PaperMapper paperMapper;
     @Resource
     private ClassMapper classMapper;
@@ -233,8 +232,20 @@ public class PaperAnalyzeService {
      * @Date 2020/9/23 16:58
      * @return java.util.List<com.xhkjedu.sstudy.vo.gradeclass.ClassVo>
      **/
-    public List<Map> listPaperClass(Integer paperid, Integer schoolid) {
-        return paperAnalyzeMapper.listPaperClass(paperid, schoolid);
+    public List<Map> listPaperClass(Integer paperid, Integer schoolid, Integer createid) {
+        TPaper paper = paperMapper.selectByPrimaryKey(paperid);
+        Integer hashb = paper.getHashb();
+        List<Map> classlist = classMapper.listQxClassByTeacherid(createid, paper.getYear());
+        Map<String, String> cmap = StudyUtil.setQxClass(classlist);
+        String classids;
+        if (createid.equals(paper.getCreateid())) {//自己发布的看所有班级
+            classids = null;
+        } else if (hashb == 1 && paper.getSchoolid().equals(schoolid)) {//有伙伴学校并且是本校发的
+            classids = cmap.get("classids");
+        } else {
+            classids = cmap.get("bxclassids");
+        }
+        return paperAnalyzeMapper.listPaperClass(paperid, schoolid, classids);
     }
 
     /**

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

@@ -8,6 +8,7 @@ import com.xhkjedu.sstudy.vo.paperstudent.PaperStudentQuestionVo;
 import com.xhkjedu.sstudy.vo.paperstudent.StudentPaperTypeVo;
 import com.xhkjedu.utils.N_Utils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -16,10 +17,7 @@ import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
@@ -246,4 +244,29 @@ public class StudyUtil {
         }
         return list;
     }
+
+    /**
+     * @Description 教师权限班级
+     * @Param [classlist]
+     * @Author ywx
+     * @Date 2023/7/31 14:03
+     * @return java.util.Map
+     **/
+    public static Map setQxClass(List<Map> classlist) {
+        //所有权限班级集合
+        List<Integer> classidlist = classlist.stream().map(s -> Integer.parseInt(s.get("classid").toString())).collect(Collectors.toList());
+        //本校班级集合
+        List<Integer> bxclassidlist = classlist.stream().filter(c -> c.get("schoolid").equals(c.get("userschoolid")))
+                                               .map(s -> Integer.parseInt(s.get("classid").toString())).collect(Collectors.toList());
+
+        String classids = StringUtils.join(classidlist, ",");
+        String bxclassids = StringUtils.join(bxclassidlist,",");
+        if(N_Utils.isEmpty(classids)) classids = "0";
+        if(N_Utils.isEmpty(bxclassids)) bxclassids = "0";
+
+        Map rtnmap = new HashMap();
+        rtnmap.put("classids",classids);
+        rtnmap.put("bxclassids",bxclassids);
+        return rtnmap;
+    }
 }

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

@@ -314,6 +314,7 @@
         from t_paper_class pg left join t_class c on pg.classid = c.classid
         left join t_school s on c.schoolid = s.schoolid
         where pg.paperid=#{paperid}
+        <if test="classids!=null and classids!=''"> and pg.classid in (${classids})</if>
         group by pg.classid order by case c.schoolid when #{schoolid} then 0 else c.schoolid end,c.gradeid,c.classtype,c.classorder
     </select>
     <!--作业班级学生列表-->