Merge remote-tracking branch 'origin/ywx' into wn

sstudy/src/main/java/com/xhkjedu/sstudy/controller/paperstudent/PaperClassController.java

@@ -27,19 +27,6 @@ public class PaperClassController {
     @Autowired
     private PaperClassService paperClassService;
 
-    /**
-     *功能描述  发布作业
-     * @author WN
-     * @date 2020/6/9
-     * @param  * @param paperGroupParam
-     * @return com.xhkjedu.vo.ResultVo
-     */
-    @PostMapping("/save")
-    public ResultVo save(@RequestBody PaperGroupParam paperGroupParam){
-        N_Utils.validation(new Object[]{paperGroupParam.getPaperid(),"作业id",1,paperGroupParam.getShowtype(),"公布答案",1,paperGroupParam.getClasslst(),"班级",1});
-        return paperClassService.savePaperGroup(paperGroupParam);
-    }
-
     //发布作业（兼容靶向作业）
     @PostMapping("/save2")
     public ResultVo save2(@RequestBody PaperGroupParam paperGroupParam){

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

@@ -80,7 +80,8 @@ public class GuideController {
     @PostMapping("/list_class")
     public ResultVo listClass(@RequestBody TGuide guide) {
         Integer guideid = guide.getGuideid();
-        N_Utils.validation(new Object[]{guideid, "预习id", 1,guide.getCreateid(),"教师id",1});
+        N_Utils.validation(new Object[]{guideid, "预习id", 1,guide.getCreateid(),"教师id",1
+                ,guide.getSchoolid(),"学校id",1});
         Map<String, String> map = classService.getQxClassidsByTeacherid(guide.getCreateid());
         guide.setClassids(map.get("classids"));
         guide.setBxclassids(map.get("bxclassids"));

sstudy/src/main/java/com/xhkjedu/sstudy/service/paperstudent/PaperClassService.java

@@ -8,11 +8,14 @@ import com.xhkjedu.sstudy.mapper.paper.PaperScantronMapper;
 import com.xhkjedu.sstudy.mapper.paperstudent.PaperClassMapper;
 import com.xhkjedu.sstudy.mapper.paperstudent.PaperStudentMapper;
 import com.xhkjedu.sstudy.mapper.paperstudent.PaperStudentQuestionMapper;
+import com.xhkjedu.sstudy.mapper.paperstudent.PaperStudentScantronMapper;
 import com.xhkjedu.sstudy.model.paper.TPaper;
 import com.xhkjedu.sstudy.model.paper.TPaperQtypeQuestion;
+import com.xhkjedu.sstudy.model.paper.TPaperScantron;
 import com.xhkjedu.sstudy.model.paperstudent.TPaperClass;
 import com.xhkjedu.sstudy.model.paperstudent.TPaperStudent;
 import com.xhkjedu.sstudy.model.paperstudent.TPaperStudentQuestion;
+import com.xhkjedu.sstudy.model.paperstudent.TPaperStudentScantron;
 import com.xhkjedu.sstudy.utils.ArithUtil;
 import com.xhkjedu.sstudy.vo.paperstudent.PaperClassParam;
 import com.xhkjedu.sstudy.vo.paperstudent.PaperGroupParam;
@@ -23,9 +26,7 @@ import com.xhkjedu.sstudy.vo.subjectbook.PointVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -58,144 +59,61 @@ public class PaperClassService {
     private PaperScantronMapper paperScantronMapper;
     @Resource
     private PaperStudentQuestionMapper paperStudentQuestionMapper;
+    @Resource
+    private PaperStudentScantronMapper paperStudentScantronMapper;
 
-    /**
-     *功能描述
-     * @author WN
-     * @date 2020/6/9
-     * @param  * @param paperGroupVo
-     * @return void
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public ResultVo savePaperGroup(PaperGroupParam paperGroupParam){
-        ResultVo resultVo = null;
-        try {
-            //获取试卷详细信息
-            TPaper paper = paperMapper.selectByPrimaryKey(paperGroupParam.getPaperid());
-            if (paper.getPaperstate() == 22) return new ResultVo(0,"保存成功");
-            //班级
-            List<TPaperClass> classlst = paperGroupParam.getClasslst().stream().distinct().collect(Collectors.toList());
-            List<Map> jtrclist = paperGroupParam.getJtrclist();
-
-            if (N_Utils.isListEmpty(classlst) && N_Utils.isListEmpty(jtrclist)) {
-                return new ResultVo(1, "发布作业未选择班级");
-            }else{
-
-                //保存作业分组、作业学生
-                resultVo = this.savePaperStudent(paperGroupParam,classlst,paper);
-                if(resultVo.getCode()==1){
-                    return resultVo;
-                }else{
-                    //获取作业是否全是非主观题
-                    int count = 0;
-                    if(paper.getPapertype()==1){
-                        //题库作业
-                        count = paperQtypeQuestionMapper.getQuestionCountCtype(paperGroupParam.getPaperid());
-                    }else{
-                        //答题卡作业
-                        count = paperScantronMapper.getQuestionCountCtype(paperGroupParam.getPaperid());
-                    }
-
-                    //保存作业分组、作业学生成功后，修改作业状态
-                    Integer hashb = 0;
-                    if (N_Utils.isListNotEmpty(jtrclist)) hashb = 1;
-                    paperMapper.updatePaperState(22,paperGroupParam.getPaperid(),count,hashb);
-
-                    resultVo.setObj(count);//如果count=0则，代表全部是选择题
-                }
-            }
-
-        }catch (Exception e){
-            log.error("发布作业失败：" + e.getMessage());
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return new ResultVo(1,"发布失败");
-        }
-        return resultVo;
-    }
-
-    private ResultVo savePaperStudent(PaperGroupParam paperGroupParam, List<TPaperClass> classlst, TPaper paper) {
-        List<TPaperClass> savegroup = new ArrayList<>();//班级分组
-        List<TPaperStudent> saveps = new ArrayList<>();//班级分组学生
-
-        Integer schoolid = paperGroupParam.getSchoolid();
-        Integer paperid = paperGroupParam.getPaperid();
-        Integer starttime = paperGroupParam.getStarttime();
-        Integer stoptime = paperGroupParam.getStoptime();
-        Integer showtype = paperGroupParam.getShowtype();
-        Integer createid = paperGroupParam.getCreateid();
-        Integer papernum = paper.getPapernum();
-        Double paperscore = paper.getPaperscore();
-        for (TPaperClass pg : classlst) {
-            List<Integer> groups = pg.getGroups();
-            Integer classid = pg.getClassid();
-            //处理作业分组数据
-            setPaperGroup(savegroup, saveps, schoolid, paperid, starttime, stoptime, showtype
-                    , createid, papernum, paperscore, classid, groups);
-        }
-
-        //集团校班级学生
-        List<Map> jtrclist = paperGroupParam.getJtrclist();
-        for (Map schoolmap : jtrclist) {
-            schoolid = Integer.parseInt(schoolmap.get("schoolid").toString());
-            List<Map> classlist = (List<Map>) schoolmap.get("classlist");
-            for (Map classmap : classlist) {
-                Integer classid = Integer.parseInt(classmap.get("classid").toString());
-                List<Integer> groups = (List<Integer>) classmap.get("groups");
-                //处理作业分组数据
-                setPaperGroup(savegroup, saveps, schoolid, paperid, starttime, stoptime, showtype
-                        , createid, papernum, paperscore, classid, groups);
-            }
-        }
-
-        //批量保存作业班级，作业班级学生信息
-        try {
-            paperClassMapper.insertList(savegroup);
-        } catch (Exception e) {
-            if (e instanceof DuplicateKeyException) {
-                return new ResultVo(0, "保存成功");
-            }
-        }
-        paperStudentMapper.saveBatchPaperStudent(saveps);
-        return new ResultVo(0, "保存成功");
-    }
-
-    //处理作业分组数据
-    private void setPaperGroup(List<TPaperClass> savegroup, List<TPaperStudent> saveps
-            , Integer schoolid, Integer paperid, Integer starttime, Integer stoptime
-            , Integer showtype, Integer createid, Integer papernum, Double paperscore
-            , Integer classid, List<Integer> groups) {
-        if (N_Utils.isListNotEmpty(groups)) {
+    //处理作业分组数据（附件）
+    private Integer setPaperGroup(Integer stunum
+            , List<TPaperScantron> pquestions, Integer timestamp, Integer schoolid
+            , Integer paperid, Integer starttime, Integer stoptime, Integer showtype, Integer createid
+            , Integer papernum, Double paperscore, Integer classid, List<PaperStudentParam> students, Integer hasfc) {
+        List<TPaperStudentScantron> savestuque=new ArrayList<>();
+        if (N_Utils.isListNotEmpty(students)) {
             TPaperClass pg = new TPaperClass();
-            pg.setClassid(classid);
             pg.setPaperid(paperid);
-            pg.setPgstate(22);//布置作业
+            pg.setClassid(classid);
+            pg.setPgstate(22);
             pg.setStarttime(starttime);
             pg.setStoptime(stoptime);
             pg.setShowtype(showtype);
             pg.setCreateid(createid);
             pg.setSchoolid(schoolid);
-            pg.setCreatetime(N_Utils.getSecondTimestamp());
+            pg.setCreatetime(timestamp);
             pg.setChecked(0);
+            pg.setHasfc(hasfc);
+            paperClassMapper.insertSelective(pg);
 
-            savegroup.add(pg);
-            String groupids = StringUtils.join(groups, ",");
-            //获取选中班级分组下所有学生
-            List<Integer> stus = classMapper.listStudentidsByGroupids(groupids);
-
-            for (Integer stu : stus) {
+            //根据studentid集合去重
+            List<PaperStudentParam> students2 = students.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(PaperStudentParam::getStudentid))), ArrayList::new));
+            for (PaperStudentParam s : students2) {
                 TPaperStudent ps = new TPaperStudent();
                 ps.setPaperid(paperid);
                 ps.setClassid(classid);
-                ps.setStudentid(stu);
-                ps.setPapernum(papernum);
-                ps.setPaperscore(paperscore);
+                ps.setStudentid(s.getStudentid());
                 ps.setCreateid(createid);
-                ps.setSchoolid(schoolid);
                 ps.setCreatetime(N_Utils.getSecondTimestamp());
-
-                saveps.add(ps);
+                ps.setSchoolid(schoolid);
+                ps.setPapernum(papernum);
+                ps.setPaperscore(paperscore);
+                Integer psid = savePaperStu(ps);
+                for (TPaperScantron q : pquestions) {
+                    TPaperStudentScantron sq=new TPaperStudentScantron();
+                    sq.setPaperid(paperid);
+                    sq.setClassid(classid);
+                    sq.setStudentid(s.getStudentid());
+                    sq.setPsid(psid);
+                    sq.setPscaid(q.getPscaid());
+                    sq.setQscore(q.getPsscore());
+                    sq.setQn(q.getQn());
+                    sq.setQorder(q.getPsorder());
+                    sq.setSchoolid(schoolid);
+                    savestuque.add(sq);
+                }
+                stunum += 1;
             }
+            if(N_Utils.isListNotEmpty(savestuque)) paperStudentScantronMapper.saveBatchStudentScantron(savestuque);
         }
+        return stunum;
     }
 
     /**
@@ -326,7 +244,7 @@ public class PaperClassService {
                 return new ResultVo(1, "发布作业未选择班级");
             } else {
                 Integer stunum = 0;
-                List<TPaperQtypeQuestion> pquestions = new ArrayList<>();//试卷中所有试题
+                List pquestions;//试卷中所有试题
                 Integer timestamp = N_Utils.getSecondTimestamp();
                 Integer papertype = paper.getPapertype();
                 Integer schoolid = paperGroupParam.getSchoolid();
@@ -337,7 +255,9 @@ public class PaperClassService {
                 Integer createid = paperGroupParam.getCreateid();
                 Integer papernum = paper.getPapernum();
                 Double paperscore = paper.getPaperscore();
-                if (papertype == 3) {
+                if (papertype == 2) {//附件
+                    pquestions = paperScantronMapper.listPaperScansByPaperid(paperid);
+                } else {
                     pquestions = paperQtypeQuestionMapper.listQuestionByPaperid(paperid);
                 }
                 //遍历班级，班级学生
@@ -346,8 +266,13 @@ public class PaperClassService {
                     Integer hasfc = c.getHasfc();
                     List<PaperStudentParam> students = c.getStudents();
                     //处理作业分组数据
-                    stunum = setPaperGroup2(stunum, pquestions, timestamp, papertype, schoolid, paperid
-                            , starttime, stoptime, showtype, createid, papernum, paperscore, classid, students,hasfc);
+                    if (papertype == 2) {//附件
+                        stunum = setPaperGroup(stunum, pquestions, timestamp, schoolid, paperid
+                                , starttime, stoptime, showtype, createid, papernum, paperscore, classid, students, hasfc);
+                    } else {
+                        stunum = setPaperGroup2(stunum, pquestions, timestamp, papertype, schoolid, paperid
+                                , starttime, stoptime, showtype, createid, papernum, paperscore, classid, students, hasfc);
+                    }
                 }
 
                 //集团校班级学生
@@ -356,11 +281,20 @@ public class PaperClassService {
                     List<Map> classlist = (List<Map>) schoolmap.get("classlist");
                     for (Map classmap : classlist) {
                         Integer classid = Integer.parseInt(classmap.get("classid").toString());
-                        Integer hasfc = Integer.parseInt(classmap.get("hasfc").toString());
+                        Integer hasfc = 0;
+                        Object fc = classmap.get("hasfc");
+                        if (N_Utils.isNotEmpty(fc)) {
+                            hasfc = N_Utils.str2Int(fc.toString());
+                        }
                         List<PaperStudentParam> students = JSON.parseArray(JSON.toJSONString(classmap.get("students")), PaperStudentParam.class);
                         //处理作业分组数据
-                        stunum = setPaperGroup2(stunum, pquestions, timestamp, papertype, schoolid, paperid
-                                , starttime, stoptime, showtype, createid, papernum, paperscore, classid, students,hasfc);
+                        if (papertype == 2) {//附件
+                            stunum = setPaperGroup(stunum, pquestions, timestamp, schoolid, paperid
+                                    , starttime, stoptime, showtype, createid, papernum, paperscore, classid, students, hasfc);
+                        } else {
+                            stunum = setPaperGroup2(stunum, pquestions, timestamp, papertype, schoolid, paperid
+                                    , starttime, stoptime, showtype, createid, papernum, paperscore, classid, students, hasfc);
+                        }
                     }
                 }
 

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

@@ -104,6 +104,7 @@ public class StudyUtil {
                     q.setQscore(score);
                     q.setQorder(tq.getQorder());
                     q.setSonques(sonques);
+                    q.setStuscore(sonques.stream().mapToDouble(sq->sq.getStuscore()).sum());
                 }else {
                     q=tq;
                 }

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

@@ -71,4 +71,7 @@ public class PaperTeacherAppVo {
     private Integer schoolid;
 
     private Integer logschoolid;
+
+    //创建人姓名
+    private String createname;
 }

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

@@ -24,6 +24,6 @@
 
     <!--作业中所有试题-->
     <select id="listPaperScansByPaperid" resultType="com.xhkjedu.sstudy.model.paper.TPaperScantron">
-        select pscaid,ctype,psorder,psscore,psanswer from t_paper_scantron where paperid=#{paperid} order by psorder
+        select pscaid,ctype,psorder,psscore,psanswer,qn from t_paper_scantron where paperid=#{paperid} order by psorder
     </select>
 </mapper>

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

@@ -12,6 +12,7 @@
         <result property="stoptime" column="stoptime"></result>
         <result property="schoolid" column="schoolid"></result>
         <result property="logschoolid" column="logschoolid"></result>
+        <result property="createname" column="createname"></result>
         <collection property="students" ofType="com.xhkjedu.sstudy.vo.paperstudent.StudentVo"
                     select="listPaperStu" column="{paperid=paperid,createid=createid,checkid=checkid,logschoolid=logschoolid,classids=classids}">
         </collection>
@@ -28,6 +29,7 @@
         select p.paperid,p.papername,p.papernum,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createid,#{paper.teacherid} checkid
         ,min(pg.starttime)starttime,min(pg.stoptime)stoptime,pg.checked,p.subjectid,p.paperscore,p.schoolid,#{paper.schoolid} logschoolid
         ,group_concat(pg.classid) classids
+        ,(select u.username from t_user u where u.userid=p.createid)createname
         from t_paper p left join t_paper_class pg on p.paperid=pg.paperid
         where (p.createid=#{paper.teacherid} or pg.checkid=#{paper.teacherid} or
         (p.hashb=1 and pg.classid in (${paper.classids})) or
@@ -46,6 +48,7 @@
     <select id="listWbz" resultType="com.xhkjedu.sstudy.vo.paper.PaperTeacherAppVo">
         select p.paperid,p.papername,p.papernum,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createid
         ,p.subjectid,p.paperscore,p.schoolid
+        ,(select u.username from t_user u where u.userid=p.createid)createname
         from t_paper p where p.createid=#{paper.teacherid} and p.paperstate=#{paper.psstate}
         order by p.createtime desc,p.paperid desc
     </select>