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

sexam/src/main/java/com/xhkjedu/sexam/controller/paper/EPaperController.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sexam.controller.paper;
 
 import com.xhkjedu.sexam.model.exam.ESubject;
 import com.xhkjedu.sexam.model.paper.EPaper;
+import com.xhkjedu.sexam.model.paper.EPaperBack;
 import com.xhkjedu.sexam.service.paper.EPaperService;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
@@ -31,6 +32,24 @@ public class EPaperController {
         return new ResultVo(0,"成功获取考试试卷信息",list);
     }
 
+    //退回试卷
+    @PostMapping("/sb")
+    public ResultVo saveExamPaperBack(@RequestBody EPaperBack ePaperBack){
+        N_Utils.validation(new Object[]{ePaperBack.getEpid(),"试卷id",1});
+        ePaperService.savePaperBack(ePaperBack);
+        return new ResultVo(0,"成功退回试卷",null);
+    }
+
+    //试卷退回列表
+    @PostMapping("/bl")
+    public ResultVo listPaperBacks(@RequestBody EPaperBack ePaperBack){
+        N_Utils.validation(new Object[]{ePaperBack.getEpid(),"试卷id",1});
+        List<Map> list = ePaperService.listPaperBacksByEpid(ePaperBack.getEpid());
+        return new ResultVo(0,"成功获取试卷退回原因",list);
+    }
+
+
+
     //教师出卷列表
     @PostMapping("/listt")
     public ResultVo examTeacherPaperList(@RequestBody ESubject subject){

sexam/src/main/java/com/xhkjedu/sexam/controller/paper/EPaperFjtypeController.java

@@ -1,11 +1,15 @@
 package com.xhkjedu.sexam.controller.paper;
 
+import com.xhkjedu.sexam.model.paper.EPaper;
 import com.xhkjedu.sexam.service.paper.EPaperFjtypeService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-
 /**
  * @Description 附件试卷
  * @Author WN
@@ -18,4 +22,12 @@ public class EPaperFjtypeController {
     @Resource
     private EPaperFjtypeService ePaperFjtypeService;
 
+    //保存试卷信息
+    @PostMapping("/save")
+    public ResultVo savePaperFj(@RequestBody EPaper paper){
+        N_Utils.validation(new Object[]{paper.getExamid(),"考试id",1});
+        ePaperFjtypeService.saveFjPaper(paper);
+        return new ResultVo(0,"成功保存试卷信息",null);
+    }
+
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/exam/ESubjectMapper.java

@@ -13,4 +13,10 @@ public interface ESubjectMapper extends TkMapper<ESubject> {
 
     //考试下所有科目
     List<ESubjectVo> listExamSubjects(@Param("examid") Integer examid);
+
+    //更新考试科目状态
+    void updateExamSubjectState(@Param("esubject") ESubject esubject);
+
+    //根据试卷id更新考试科目状态
+    void updateEsubjectStateByEpid(@Param("esstate") Integer esstate,@Param("epid") Integer epid);
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/paper/EPaperBackMapper.java

@@ -0,0 +1,19 @@
+package com.xhkjedu.sexam.mapper.paper;
+
+import com.xhkjedu.sexam.base.TkMapper;
+import com.xhkjedu.sexam.model.paper.EPaperBack;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description 试卷回退
+ * @Author WN
+ * Date 2022/7/18 16:38
+ **/
+public interface EPaperBackMapper extends TkMapper<EPaperBack> {
+
+    //获取试卷退回原因
+    List<Map> listPaperBacksByEpid(@Param("epid")Integer epid);
+}

sexam/src/main/java/com/xhkjedu/sexam/mapper/paper/EPaperMapper.java

@@ -21,4 +21,7 @@ public interface EPaperMapper extends TkMapper<EPaper> {
 
     //教师出卷列表
     List<Map> listExamPapersByTeacherid(@Param("teacherid") Integer teacherid);
+
+    //试卷详情
+    Map getExamPaperDetailByEpid(@Param("epid") Integer epid);
 }

sexam/src/main/java/com/xhkjedu/sexam/model/paper/EPaper.java

@@ -33,6 +33,9 @@ public class EPaper extends BaseBean {
     //试卷总分
     private Double pscore;
 
+    //是否设置正确答案0未设置1已设置
+    private Integer answered;
+
     //批阅设置：1按班设置2按题设置
     private Integer correcttype;
 

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

@@ -1,15 +1,20 @@
 package com.xhkjedu.sexam.service.paper;
 
+import com.alibaba.fastjson.JSON;
 import com.xhkjedu.sexam.mapper.exam.ESubjectMapper;
 import com.xhkjedu.sexam.mapper.paper.*;
 import com.xhkjedu.sexam.model.exam.ESubject;
 import com.xhkjedu.sexam.model.paper.*;
+import com.xhkjedu.sexam.vo.paper.EPaperQsVo;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -32,7 +37,8 @@ public class EPaperFjtypeService {
     @Resource
     private EPaperAnalyzeMapper ePaperAnalyzeMapper;
 
-
+    //保存试卷
+    @Transactional(rollbackFor = Exception.class)
     public void saveFjPaper(EPaper paper){
         int epid = 0;
 
@@ -57,6 +63,7 @@ public class EPaperFjtypeService {
         paper.setCreatetime(timestamp);
         paper.setHandletime(timestamp);
         paper.setHandleid(paper.getCreateid());
+        paper.setAnswered(0);
         ePaperMapper.insertUseGeneratedKeys(paper);
         epid = paper.getId();
         paper.setEpid(epid);
@@ -65,10 +72,12 @@ public class EPaperFjtypeService {
         savePaperFile(paper);
         //保存答题卡信息
         saveFjtypeQuestion(paper,fjtypelist);
-
+        //更加试卷状态是否需要生成分析和更改科目状态
         if(paper.getPstate()!=null && paper.getPstate() == 1){
-            //如果提交试卷，则生成试卷分析
+            //如果提交试卷，则生成试卷分析，更改科目状态
             savePaperAnalyze(paper,fjtypelist,queslist);
+            eSubject.setEsstate(1);
+            eSubjectMapper.updateExamSubjectState(eSubject);
         }
     }
 
@@ -127,9 +136,51 @@ public class EPaperFjtypeService {
         double zscore = 0;
         int knum = 0;
         double kscore = 0;
-        
+        for(EPaperFjtypeQuestion q : queslist){
+            if(q.getCtype() == 3 || q.getCtype() == 11){
+                znum ++;
+                zscore = zscore + q.getScore();
+            }else{
+                knum ++;
+                kscore = kscore + q.getScore();
+            }
+        }
+
+        double znumrate = N_Utils.getIntegerDivideAndMulitiply(znum, ePaper.getPnum());
+        double knumrate = 100-znumrate;
+        double zscorerate = N_Utils.getDoubleDivideAndMulitiply(zscore, ePaper.getPscore());
+        double kscorerate = 100 - zscorerate;
+
+        List<EPaperQsVo> ranglist = new ArrayList<>();
+        ranglist.add(new EPaperQsVo("主观题",zscore,znum,zscorerate,znumrate));
+        ranglist.add(new EPaperQsVo("客观题",kscore,knum,kscorerate,knumrate));
 
+        Map ztmap = new HashMap<>();
+        ztmap.put("pnum", ePaper.getPnum());
+        ztmap.put("pscore",ePaper.getPscore());
+        ztmap.put("ranglist",ranglist);
+
+        //题型分布
+        List<EPaperQsVo> qtlist = new ArrayList<>();
+        for(EPaperFjtype fjt : fjtypelist){
+            EPaperQsVo qvo = new EPaperQsVo();
+            qvo.setQtname(fjt.getEpfjname());
+            qvo.setNum(fjt.getEpfjnum());
+            qvo.setScore(fjt.getEpfjscore());
+            double scorerate = N_Utils.getDoubleDivideAndMulitiply(fjt.getEpfjscore(), ePaper.getPscore());
+            qvo.setSrate(scorerate);
+            qtlist.add(qvo);
+        }
+
+        EPaperAnalyze epa = new EPaperAnalyze();
+        epa.setEpaid(ePaper.getEpid());
+        epa.setAlljson(JSON.toJSONString(ztmap));
+        epa.setQnumjson(JSON.toJSONString(qtlist));
+        ePaperAnalyzeMapper.insertUseGeneratedKeys(epa);
+    }
 
+    //试卷详情
+    public void getPaperDetail(Integer epid){
 
     }
 }

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

@@ -1,10 +1,14 @@
 package com.xhkjedu.sexam.service.paper;
 
 import com.xhkjedu.sexam.mapper.exam.ESubjectMapper;
+import com.xhkjedu.sexam.mapper.paper.EPaperBackMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperMapper;
 import com.xhkjedu.sexam.model.paper.EPaper;
+import com.xhkjedu.sexam.model.paper.EPaperBack;
 import com.xhkjedu.sexam.vo.exam.ESubjectVo;
+import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -23,16 +27,52 @@ public class EPaperService {
     @Resource
     private EPaperMapper ePaperMapper;
     @Resource
+    private EPaperBackMapper ePaperBackMapper;
+    @Resource
     private ESubjectMapper eSubjectMapper;
 
 
+
     //考试各科目试卷设置
     public List<Map> listExamPapers(Integer examid) {
         return ePaperMapper.listExamPapers(examid);
     }
 
+    //试卷退回
+    @Transactional(rollbackFor = Exception.class)
+    public void savePaperBack(EPaperBack ePaperBack){
+        int timestamp = N_Utils.getSecondTimestamp();
+        ePaperBack.setCreatetime(timestamp);
+        ePaperBackMapper.insertUseGeneratedKeys(ePaperBack);
+        //更改试卷科目状态
+        eSubjectMapper.updateEsubjectStateByEpid(2,ePaperBack.getEpid());
+        //试卷回退需要发送通知和短息，后续添加
+    }
+
+    //试卷退回原因
+    public List<Map> listPaperBacksByEpid(Integer epid){
+        return ePaperBackMapper.listPaperBacksByEpid(epid);
+    }
+
     //教师出卷列表
     public List<Map> listExamPapersByTeacherid(Integer teacherid){
         return ePaperMapper.listExamPapersByTeacherid(teacherid);
     }
+
+    //试卷详情
+    public Map getExamPaperDetailByEpid(Integer epid){
+        Map map = ePaperMapper.getExamPaperDetailByEpid(epid);
+        //试卷类型1题库2答题卡3仅答题卡
+        int ptype = Integer.parseInt(map.get("ptype").toString());
+        if(ptype == 1){
+
+        }else if(ptype == 2){
+
+        }else{
+
+        }
+
+        return null;
+    }
+
 }

sexam/src/main/java/com/xhkjedu/sexam/vo/paper/EPaperQsVo.java

@@ -0,0 +1,34 @@
+package com.xhkjedu.sexam.vo.paper;
+
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @Description 试卷分值分析
+ * @Author WN
+ * Date 2022/7/18 15:45
+ **/
+@Data
+public class EPaperQsVo {
+
+    private String qtname;//名称
+
+    private double score;//分值
+
+    private int num;//数量
+
+    private double srate;//分值占比
+
+    private double nrate;//数量占比
+    public EPaperQsVo(){
+
+    }
+
+    public EPaperQsVo(String qtname,double score,int num,double srate,double nrate){
+        this.qtname = qtname;
+        this.score = score;
+        this.num = num;
+        this.srate = srate;
+        this.nrate = nrate;
+    }
+}

sexam/src/main/resources/application.properties

@@ -1,9 +1,9 @@
 server.port=8088
 spring.application.name=sexam
 #注册到我们本地的eureka注册中心，端口8081
-eureka.client.service-url.defaultZone=http://127.0.0.1:8081/eureka/
-#eureka.client.register-with-eureka=false
-#eureka.client.fetch-registry=false
+#eureka.client.service-url.defaultZone=http://127.0.0.1:8081/eureka/
+eureka.client.register-with-eureka=false
+eureka.client.fetch-registry=false
 #设置eureka输出日志级别
 logging.level.com.netflix=error
 
@@ -29,6 +29,7 @@ spring.datasource.hikari.connection-test-query=SELECT 1
 # 所有Entity别名类所在包
 mybatis.type-aliases-package=com.xhkjedu.sexam.model,com.xhkjedu.sexam.vo
 mybatis.mapper-Locations=classpath*:mapper/**/*.xml
+mybatis.configuration.call-setters-on-nulls=true
 mapper.mappers=com.xhkjedu.sexam.base.TkMapper
 mapper.identity=MYSQL
 #打印日志

sexam/src/main/resources/mapper/exam/ESubjectMapper.xml

@@ -17,4 +17,14 @@
         left join t_subject s on es.subjectid=s.subjectid
         where es.examid=#{examid} order by s.subjectorder
     </select>
+
+    <!--根据考试科目id更改考试科目状态-->
+    <update id="updateExamSubjectState">
+        update e_subject set esstate=#{esubject.esstate} where esid = #{esubject.esid};
+    </update>
+
+    <!--根据试卷id更新考试科目状态-->
+    <update id="updateEsubjectStateByEpid">
+        update e_subject es,e_paper ep set es.esstate=#{esstate} where es.esid=ep.esid and ep.epid=#{epid}
+    </update>
 </mapper>

sexam/src/main/resources/mapper/paper/EPaperBackMapper.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhkjedu.sexam.mapper.paper.EPaperBackMapper">
+    <!--试卷退回原因-->
+    <select id="listPaperBacksByEpid" resultType="java.util.Map">
+        select eb.*,u.username createname
+        from e_paper_back eb left join t_user u on eb.createid=u.userid
+        where eb.epid=#{epid}
+    </select>
+</mapper>

sexam/src/main/resources/mapper/paper/EPaperFjtypeMapper.xml

@@ -2,5 +2,32 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.sexam.mapper.paper.EPaperFjtypeMapper">
 
-
+    <resultMap id="fjtypeQuestions" type="java.util.Map">
+        <result column="epfjid" property="epfjid"></result>
+        <result column="epid" property="epid"></result>
+        <result column="epfjname" property="epfjname"></result>
+        <result column="epfjnum" property="epfjnum"></result>
+        <result column="epfjorder" property="epfjorder"></result>
+        <result column="epfjscore" property="epfjscore"></result>
+        <collection property="questions" ofType="java.util.Map">
+            <result column="epfjqid" property="epfjqid"></result>
+            <result column="epfjid" property="epfjid"></result>
+            <result column="epid" property="epid"></result>
+            <result column="qtypeid" property="qtypeid"></result>
+            <result column="qtypename" property="qtypename"></result>
+            <result column="ctype" property="ctype"></result>
+            <result column="score" property="score"></result>
+            <result column="qn" property="qn"></result>
+            <result column="order" property="order"></result>
+            <result column="answer" property="answer"></result>
+            <result column="optionnum" property="optionnum"></result>
+        </collection>
+    </resultMap>
+    <select id="listPaperFjtypeQuestions" resultMap="fjtypeQuestions">
+        select t.epfjid,t.epid,t.epfjname,t.epfjnum,t.epfjorder,t.epfjscore,
+               q.epfjqid,q.epfjid,q.epid,q.qtypeid,q.qtypename,q.ctype,q.score,q.qn,q.order,q.answer,q.optionnum
+        from e_paper_fjtype t left join e_paper_fjtype_question q on t.epfjid=q.epfjid
+        where t.epid=#{epid}
+    </select>
+    
 </mapper>

sexam/src/main/resources/mapper/paper/EPaperMapper.xml

@@ -5,7 +5,7 @@
     <!--获取考试下有科目试卷信息-->
     <select id="listExamPapers" resultType="java.util.Map">
         select es.esid,es.subjectid,es.sdate,es.begintime,es.endtime,es.teacherid,u2.username as teachername,es.esstate,es.ptype
-        ,ep.epid,ep.pnum,ep.pscore,s.subjectname,ep.handleid,u.username as handlename
+        ,ep.epid,ep.pnum,ep.pscore,ep.answered,s.subjectname,ep.handleid,u.username as handlename
         from e_subject es left join e_paper ep on es.esid=ep.esid
         left join t_subject s on es.subjectid=s.subjectid
         left join t_user u on ep.handleid=u.userid
@@ -16,7 +16,7 @@
     <!--教师出卷列表-->
     <select id="listExamPapersByTeacherid" resultType="java.util.Map">
         select es.esid,es.subjectid,es.sdate,es.begintime,es.endtime,es.teacherid,u2.username as teachername,es.esstate,es.ptype
-        ,ep.epid,ep.pnum,ep.pscore,s.subjectname,ep.handleid,u.username as handlename,es.examid,e.examname
+        ,ep.epid,ep.pnum,ep.pscore,ep.answered,s.subjectname,ep.handleid,u.username as handlename,es.examid,e.examname
         from e_subject es left join e_paper ep on es.esid=ep.esid
         left join t_subject s on es.subjectid=s.subjectid
         left join e_base e on es.examid=e.examid
@@ -25,4 +25,14 @@
         where es.teacherid=#{teacherid} order by es.examid desc, s.subjectorder asc
 
     </select>
+
+    <!--试卷详情-->
+    <select id="getExamPaperDetailByEpid" resultType="java.util.Map">
+        select ep.epid,ep.examid,ep.ptype,ep.pnum,ep.pscore,ep.answered,ep.hearfile,
+        ep.handleid,ep.handletime,s.subjectname,u.username as handlename
+        from e_paper ep left join e_base e on ep.examid=e.examid
+        left join t_subject s on ep.subjectid=s.subjectid
+        left join t_user u on ep.handleid=u.userid
+        where ep.epid=#{epid}
+    </select>
 </mapper>