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

# Conflicts:
#	sexam/src/main/java/com/xhkjedu/sexam/service/paperstudent/EPsqbatchService.java

sexam/src/main/java/com/xhkjedu/sexam/controller/paperstudent/EPsqbatchController.java

@@ -3,6 +3,7 @@ package com.xhkjedu.sexam.controller.paperstudent;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.sexam.model.paperstudent.EPsqbatch;
+import com.xhkjedu.sexam.model.paperstudent.EPsqbatchDetail;
 import com.xhkjedu.sexam.service.paperstudent.EPsqbatchService;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
@@ -18,6 +19,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 /**
  * @Description 考试补录
@@ -50,13 +52,36 @@ public class EPsqbatchController {
         try {
             Integer page = ePsqbatch.getPage();
             Integer pageSize = ePsqbatch.getPageSize();
-            N_Utils.validation(new Object[]{ePsqbatch.getExamid(), "考试id", 1,page,"当前页",1,pageSize,"每页条数",1});
+            Integer examid= ePsqbatch.getExamid();
+            N_Utils.validation(new Object[]{examid, "考试id", 1,page,"当前页",1,pageSize,"每页条数",1});
             PageHelper.startPage(page, pageSize);
-            List<Map> rtnlst = ePsqbatchService.listPsqBatchsByExamid(ePsqbatch.getExamid());
+            List<Map> rtnlst = ePsqbatchService.listPsqBatchsByExamid(examid);
             PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(rtnlst));
-            return new ResultVo(0, "成功获取补录成绩信息",pageResult);
+            Map map = ePsqbatchService.getExamInfo(examid);
+            Map rtnmap = new TreeMap();
+            rtnmap.put("total",pageResult.getTotal());
+            rtnmap.put("list",pageResult.getList());
+            rtnmap.put("exam",map);
+            return new ResultVo(0, "成功获取补录成绩信息",rtnmap);
         }catch (Exception e){
-            log.error("获取获取补录成绩出错：" + e.getMessage());
+            log.error("获取获取补录成绩信息出错：" + e.getMessage());
+            return new ResultVo(0, "获取失败");
+        }
+    }
+
+    //补录成绩详情
+    @PostMapping("/detail")
+    public ResultVo listPsqBatchDetail(@RequestBody EPsqbatchDetail ePsqbatchDetail) {
+        try {
+            Integer page = ePsqbatchDetail.getPage();
+            Integer pageSize = ePsqbatchDetail.getPageSize();
+            N_Utils.validation(new Object[]{ePsqbatchDetail.getBatchid(), "补录批次id", 1,page,"当前页",1,pageSize,"每页条数",1});
+            PageHelper.startPage(page, pageSize);
+            List<Map> rtnlst = ePsqbatchService.listPsqBatchDetail(ePsqbatchDetail);
+            PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(rtnlst));
+            return new ResultVo(0, "成功获取补录成绩详细信息",pageResult);
+        }catch (Exception e){
+            log.error("获取获取补录成绩详细信息出错：" + e.getMessage());
             return new ResultVo(0, "获取失败");
         }
     }

sexam/src/main/java/com/xhkjedu/sexam/mapper/paperstudent/EPsqbatchMapper.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sexam.mapper.paperstudent;
 
 import com.xhkjedu.sexam.base.TkMapper;
 import com.xhkjedu.sexam.model.paperstudent.EPsqbatch;
+import com.xhkjedu.sexam.model.paperstudent.EPsqbatchDetail;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -17,4 +18,7 @@ public interface EPsqbatchMapper extends TkMapper<EPsqbatch> {
     //考试补录成绩批次信息
     List<Map> listPsqBatchsByExamid(@Param("examid")Integer examid);
 
+    //获取补录成绩批次详情
+    List<Map> listPsqBatchDetail(@Param("ed") EPsqbatchDetail ed);
+
 }

sexam/src/main/java/com/xhkjedu/sexam/model/paperstudent/EPsqbatchDetail.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description: 考试补录批成绩详情表
@@ -27,9 +28,15 @@ public class EPsqbatchDetail extends BaseBean {
     private Integer epid;
     private Integer eptqid;
 
+    //试卷中试题id
+    private Integer eptqid;
+
     //学生试题id
     private Integer epsqid;
 
+    //试题题号
+    private String qn;
+
     //学生原得分
     private Double stuscore;
 
@@ -41,4 +48,7 @@ public class EPsqbatchDetail extends BaseBean {
 
     //修改时间
     private Integer createtime;
+
+    @Transient
+    private String username;//用户姓名
 }

sexam/src/main/java/com/xhkjedu/sexam/service/paperstudent/EPsqbatchService.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.sexam.service.paperstudent;
 
+import com.xhkjedu.sexam.mapper.exam.EBaseMapper;
 import com.xhkjedu.sexam.mapper.exam.EClassStudentMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperQtypeQuestionMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentQuestionMapper;
@@ -39,6 +40,8 @@ public class EPsqbatchService {
     private EClassStudentMapper eClassStudentMapper;
     @Resource
     private EPaperStudentQuestionMapper ePaperStudentQuestionMapper;
+    @Resource
+    private EBaseMapper eBaseMapper;
 
     /**
      * @Description 获取考试科目
@@ -51,6 +54,11 @@ public class EPsqbatchService {
         return ePsqbatchMapper.listSubjectsByExamid(exmaid);
     }
 
+    //考试基本信息
+    public Map getExamInfo(Integer examid){
+        return eBaseMapper.findById(examid);
+    }
+
     /**
      * @Description 考试补录成绩批次信息
      * @Param [exmaid]
@@ -104,7 +112,7 @@ public class EPsqbatchService {
 
     //保存学生试题
     @Transactional(rollbackFor = Exception.class)
-    public void saveEPsqbatchDetail(EPsqbatchStuVo stu, EPsqbatch batch){
+    public void saveEPsqbatchDetail(EPsqbatchStuVo stu, EPsqbatch batch) {
         try {
             int timestamp = N_Utils.getSecondTimestamp();
             Integer batchId = batch.getId();
@@ -114,7 +122,7 @@ public class EPsqbatchService {
             List<EPsqbatchDetail> details = stu.getDetails();
             //获取试卷中所有试题
             List<Integer> eptqids = details.stream().map(d -> d.getEptqid()).collect(Collectors.toList());
-            List<EPaperStudentQuestion> questions = ePaperStudentQuestionMapper.listQuestionByStu(studentid,eptqids);
+            List<EPaperStudentQuestion> questions = ePaperStudentQuestionMapper.listQuestionByStu(studentid, eptqids);
             for (int i = 0; i < details.size(); i++) {
                 EPsqbatchDetail detail = details.get(i);
                 EPaperStudentQuestion question = questions.get(i);
@@ -131,4 +139,15 @@ public class EPsqbatchService {
             throw new RuntimeException("保存学生试题失败");
         }
     }
+
+    /**
+     * @Description 补录成绩批次详情
+     * @Param [ePsqbatchDetail]
+     * @Return java.util.List<java.util.Map>
+     * @Author wn
+     * @Date 2022/11/21 15:29
+     **/
+    public List<Map> listPsqBatchDetail(EPsqbatchDetail ePsqbatchDetail){
+        return ePsqbatchMapper.listPsqBatchDetail(ePsqbatchDetail);
+    }
 }

sexam/src/main/resources/mapper/paperstudent/EPsqBatchMapper.xml

@@ -12,12 +12,14 @@
     <select id="listPsqBatchsByExamid" resultType="java.util.Map">
         select b.batchid,b.subjectname,b.epid,b.stunum,b.teacherid,b.createtime,u.username teachername
         from e_psqbatch b left join t_user u on b.teacherid=u.userid
-        where b.examid=1 order by b.batchid desc
+        where b.examid=#{examid} order by b.batchid desc
     </select>
 
-    <!---->
+    <!--获取补录成绩批次详情-->
     <select id="listPsqBatchDetail" resultType="java.util.Map">
-
+        select d.detailid,d.studentid,d.eptqid,d.qn,d.stuscore,d.newscore,d.createtime,
+        u.username,u.loginname from e_psqbatch_detail d left join t_user u on d.studentid=u.userid
+        where d.batchid=#{ed.batchid} order by studentid,d.eptqid
     </select>
 
 </mapper>