组件-阅卷进度

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

@@ -397,4 +397,18 @@ public class ComponentController {
         N_Utils.validation(new Object[]{userid, "用户ID", 1});
         return new ResultVo(0, componentService.getExamReportSingle(params));
     }
+
+    /*
+     * @Description 考试-阅卷进度
+     * @Date 2024/7/24 10:49:38
+     * @Author WN
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/exam_check_progress")
+    public ResultVo listExamCheckProgress(@RequestBody ComponentParams params) {
+        Integer userid = params.getUserid();
+        N_Utils.validation(new Object[]{userid, "用户ID", 1});
+        return new ResultVo(0, componentService.listExamCheckProgress(params));
+    }
 }

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

@@ -3,8 +3,10 @@ package com.xhkjedu.sapi.mapper.component;
 import com.xhkjedu.sapi.vo.analyze.work.SchoolWorkSubjectVo;
 import com.xhkjedu.sapi.vo.component.ComponentParams;
 import com.xhkjedu.sapi.vo.component.ExamInfoVo;
+import com.xhkjedu.sapi.vo.component.PaperStudentQuestionVo;
 import com.xhkjedu.sapi.vo.component.StudyStatisticVo;
 import com.xhkjedu.sapi.vo.notice.NoticeVo;
+import com.xhkjedu.vo.exam.EPaperVo;
 import com.xhkjedu.vo.paper.PaperListVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -114,4 +116,10 @@ public interface ComponentMapper {
     Map<String,Object> getExamReportSingleBase(@Param("params")ComponentParams params);
     //考试-单科报告-成绩等级分布
     List<Map<String,Object>> listExamReportSingleRank(@Param("params")ComponentParams params);
+    //考试-阅卷进度-考试信息
+    ExamInfoVo getExamCheckProgressBase(@Param("params")ComponentParams params);
+    //考试-阅卷进度-试卷
+    List<EPaperVo> listExamCheckProgressPaper(@Param("examid")Integer examid);
+    //考试-阅卷进度-学生试题
+    List<PaperStudentQuestionVo> listExamCheckProgressStuQuestion(@Param("epids")String epids);
 }

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

@@ -11,10 +11,12 @@ import com.xhkjedu.sapi.utils.ApiUtil;
 import com.xhkjedu.sapi.vo.analyze.work.SchoolWorkSubjectVo;
 import com.xhkjedu.sapi.vo.component.ComponentParams;
 import com.xhkjedu.sapi.vo.component.ExamInfoVo;
+import com.xhkjedu.sapi.vo.component.PaperStudentQuestionVo;
 import com.xhkjedu.sapi.vo.component.StudyStatisticVo;
 import com.xhkjedu.sapi.vo.notice.NoticeVo;
 import com.xhkjedu.sapi.vo.subjectbook.SubjectVo;
 import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.exam.EPaperVo;
 import com.xhkjedu.vo.paper.PaperClassVo;
 import com.xhkjedu.vo.paper.PaperListVo;
 import com.xhkjedu.vo.system.UserVo;
@@ -824,5 +826,57 @@ public class ComponentService {
         return map;
     }
 
+    /*
+     * @Description 考试-阅卷进度
+     * @Date 2024/7/24 10:49:22
+     * @Author WN
+     * @Param [params]
+     * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     **/
+    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<>();
+
+        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);//获取考试学生试题
+
+            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 =//作答集合
+                        qlist.stream().filter(q -> q.getAnswered().equals(1)).collect(Collectors.toList());
+                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();//试卷批阅试题数量
+
+                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()));//批阅进度
+
+                mapList.add(map);
+            }
+        }
+
+        return mapList;
+    }
+
 
 }

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

@@ -26,4 +26,7 @@ public class ExamInfoVo {
 
     //// 科目id
     private String subjectid;
+
+    //计划考试人数
+    private Integer examnum;
 }

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

@@ -0,0 +1,114 @@
+package com.xhkjedu.sapi.vo.component;
+
+import com.xhkjedu.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+@Table(name = "e_paper_student_question")
+@Data
+public class PaperStudentQuestionVo extends BaseBean {
+    @Id
+    //考试试卷学生题库试题表
+    private Integer epsqid;
+
+    //班级id
+    private Integer classid;
+
+    //学生id
+    private Integer studentid;
+
+    //考试id
+    private Integer examid;
+
+    //科目id
+    private String subjectid;
+
+    //试卷id
+    private Integer epid;
+
+    //试卷学生id
+    private Integer epsid;
+
+    private Integer eptqid;//试卷中试题id
+
+    //处理题型
+    private Integer ctype;
+
+    //试题id
+    private String questionid;
+
+    //题号
+    private String qn;
+
+    //试题排序
+    private Integer qorder;
+
+    //是否作答0未作答1已作做答
+    private Integer answered;
+
+    //答案类型1选择题、图片2纯文本
+    private Integer answertype;
+
+    //学生答案（选项、图片）
+    private String stuanswer;
+
+    //学生答案（纯文本）
+    private String stuanswertxt;
+
+    //是否转换0未转换1已转换2转换失败
+    private Integer converted;
+
+    //提交时间
+    private Integer answertime;
+
+    //单题花费时间(单位秒)
+    private Integer costtime;
+
+    //试题分值
+    private Double qscore;
+
+    //学生得分
+    private Double stuscore;
+
+    //是否批改0未批改1批改中2已批改
+    private Integer checked;
+
+    //批改人
+    private Integer checkid;
+
+    //批改时间
+    private Integer checktime;
+
+    //优秀试卷0默认1优秀
+    private Integer good;
+
+    //违纪试卷0默认1违纪
+    private Integer bad;
+
+    //客观题是否需要重新批改0不需要1需要
+    private Integer needdeal;
+
+    @Transient
+    private String stuname;//学生姓名
+
+    @Transient
+    private String checkname;//批阅人
+
+    @Transient
+    private String answer;//试题正确答案
+
+    @Transient
+    private List<Integer> eptqids;//试卷试题ids
+
+    @Transient
+    private String classids;//班级ids
+
+    //学生试卷得分
+    @Transient
+    private Double stupaperscore;
+
+}

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

@@ -521,5 +521,30 @@
         where err.examid=#{params.examid} and err.classid=#{params.classid}
         and err.subjectid=#{params.subjectid} and err.ranktype=1
     </select>
+    <!--考试-阅卷进度-考试-->
+    <select id="getExamCheckProgressBase" resultType="com.xhkjedu.sapi.vo.component.ExamInfoVo">
+        select e.examid,(select sum(c.classnum) from e_class c where c.examid=e.examid)examnum from e_base e
+        where e.deleted=1 and e.schoolid=#{params.schoolid}  and e.examstate>0
+        <if test="params.usertype == 1">
+            and e.createid=#{params.userid}
+        </if>
+        group by e.examid order by e.examdate desc limit 1
+    </select>
+    <!--考试-阅卷进度-试卷-->
+    <select id="listExamCheckProgressPaper" resultType="com.xhkjedu.vo.exam.EPaperVo">
+        select ep.epid,ep.pnum,es.subjectid,es.subjectname,ep.correcttype
+        ,(case when ep.correcttype=1
+        then (select concat('[',group_concat(json_object('classid',epc.classid,'teacherid',epc.teacherid)),']')
+        from e_paper_correctclass epc where epc.epid=ep.epid)
+        else (select concat('[',group_concat(json_object('eptqid',epc.eptqid,'teacherid',epc.teacherid)),']')
+        from e_paper_correctquestion epc where epc.epid=ep.epid) end)correctJson
+        from e_paper ep left join e_subject es on ep.esid = es.esid
+        where ep.examid=#{examid}
+    </select>
+    <!--考试-阅卷进度-学生试题-->
+    <select id="listExamCheckProgressStuQuestion" resultType="com.xhkjedu.sapi.vo.component.PaperStudentQuestionVo">
+        select studentid,epid,eptqid,qn,answered,checked,checkid,ctype,qorder
+        from e_paper_student_question where epid in(${epids})
+    </select>
 
 </mapper>

sexam/src/main/java/com/xhkjedu/sexam/vo/paper/EPCTeacherVo.java → scommons/src/main/java/com/xhkjedu/vo/exam/EPCTeacherVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sexam.vo.paper;
+package com.xhkjedu.vo.exam;
 
 import lombok.Data;
 

sexam/src/main/java/com/xhkjedu/sexam/vo/paper/EPaperVo.java → scommons/src/main/java/com/xhkjedu/vo/exam/EPaperVo.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sexam.vo.paper;
+package com.xhkjedu.vo.exam;
 
 import lombok.Data;
 

sexam/src/main/java/com/xhkjedu/sexam/controller/exam/EBaseController.java

@@ -15,7 +15,7 @@ import com.xhkjedu.sexam.service.notice.NoticeService;
 import com.xhkjedu.sexam.service.report.EReportGenerateService;
 import com.xhkjedu.sexam.vo.exam.EBaseVo;
 import com.xhkjedu.sexam.vo.exam.ExamVo;
-import com.xhkjedu.sexam.vo.paper.EPaperVo;
+import com.xhkjedu.vo.exam.EPaperVo;
 import com.xhkjedu.utils.DatesUtil;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;

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

@@ -2,7 +2,7 @@ package com.xhkjedu.sexam.mapper.paper;
 
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
 import com.xhkjedu.sexam.vo.paper.EPaperSQuestionVo;
-import com.xhkjedu.sexam.vo.paper.EPaperVo;
+import com.xhkjedu.vo.exam.EPaperVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

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

@@ -7,9 +7,9 @@ import com.xhkjedu.sexam.mapper.paper.EPaperCorrectTeacherMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentMapper;
 import com.xhkjedu.sexam.mapper.system.UserMapper;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
-import com.xhkjedu.sexam.vo.paper.EPCTeacherVo;
+import com.xhkjedu.vo.exam.EPCTeacherVo;
 import com.xhkjedu.sexam.vo.paper.EPaperSQuestionVo;
-import com.xhkjedu.sexam.vo.paper.EPaperVo;
+import com.xhkjedu.vo.exam.EPaperVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import com.xhkjedu.vo.system.UserVo;

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

@@ -136,7 +136,7 @@
         from e_subject es left join e_base eb on eb.examid = es.examid where es.esid=#{esid}
     </select>
     <!--获取考试试卷-->
-    <select id="listPaperByExamId" resultType="com.xhkjedu.sexam.vo.paper.EPaperVo">
+    <select id="listPaperByExamId" resultType="com.xhkjedu.vo.exam.EPaperVo">
         select ep.epid,ep.pnum,es.subjectid,es.subjectname,ep.correcttype
         ,(case when ep.correcttype=1
         then (select concat('[',group_concat(json_object('classid',epc.classid,'teacherid',epc.teacherid)),']')