网关排除依赖

补录成绩

gateway/pom.xml

@@ -22,7 +22,14 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-gateway</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-transport-native-epoll</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>

smarking/src/main/java/com/xhkjedu/smarking/controller/exam/SubjectScoreController.java

@@ -0,0 +1,80 @@
+package com.xhkjedu.smarking.controller.exam;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xhkjedu.smarking.model.exam.MsClassStudent;
+import com.xhkjedu.smarking.model.exam.MsExam;
+import com.xhkjedu.smarking.service.exam.SubjectScoreService;
+import com.xhkjedu.smarking.vo.exam.SCStudentVo;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.utils.PageUtil;
+import com.xhkjedu.vo.PageResult;
+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;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description 阅卷考试表相关操作
+ * @Author auto
+ * @Date 2024-10-15
+ */
+@RestController
+@RequestMapping("/sscore")
+public class SubjectScoreController {
+    @Resource
+    private SubjectScoreService subjectScoreService;
+    /*
+     * @Description 成绩管理-科目成绩列表
+     * @Date 2024/11/11 15:25:52
+     * @Author WN
+     * @Param [msExam]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list")
+    public ResultVo listExamSubjectScore(@RequestBody MsExam msExam) {
+        Integer examid = msExam.getExamid();
+        N_Utils.validation(new Object[]{examid, "考试id", 1});
+        return new ResultVo(0, "获取成功", subjectScoreService.listExamSubjectScore(examid));
+    }
+
+    /*
+     * @Description 成绩管理-缺考学生
+     * @Date 2024/11/11 15:56:13
+     * @Author WN
+     * @Param [cvo]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/miss")
+    public ResultVo listExamSubjectMiss(@RequestBody MsClassStudent cvo) {
+        Integer page = cvo.getPage();
+        Integer size = cvo.getPageSize();
+        N_Utils.validation(new Object[]{cvo.getExamid(), "考试id", 1,cvo.getSubjectid(), "科目id", 2,page, "显示页码", 1, size, "显示条数", 1});
+
+        PageHelper.startPage(page, size);
+        List<Map<String, Object>> list = subjectScoreService.listExamSubjectScoreByClass(cvo);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+        return new ResultVo(0, "获取成功", pageResult);
+    }
+
+    /*
+     * @Description 成绩管理-缺考学生-导出
+     * @Date 2024/11/11 15:56:13
+     * @Author WN
+     * @Param [cvo]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/miss_export")
+    public ResultVo listExamSubjectMissExport(@RequestBody SCStudentVo cvo) {
+        N_Utils.validation(new Object[]{cvo.getExamid(), "考试id", 1});
+        if(!N_Utils.isListNotEmpty(cvo.getSubjectids())){
+            return new ResultVo(1, "请选择科目");
+        }
+        return new ResultVo(0, "获取成功", subjectScoreService.listSubjectMissStudentExport(cvo));
+    }
+}

smarking/src/main/java/com/xhkjedu/smarking/controller/stupaper/MsPaperStudentQuestionScoreController.java

@@ -2,16 +2,21 @@ package com.xhkjedu.smarking.controller.stupaper;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xhkjedu.smarking.model.exam.MsClassStudent;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestionScore;
 import com.xhkjedu.smarking.service.stupaper.MsPaperStudentQuestionScoreService;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
-import org.springframework.web.bind.annotation.*;
+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;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 阅卷学生分数修改历史表相关操作
@@ -19,7 +24,7 @@ import java.util.List;
  * @Date 2024-10-15
  */
 @RestController
-@RequestMapping("/msPaperStudentQuestionScore")
+@RequestMapping("/mstuqc")
 public class MsPaperStudentQuestionScoreController {
     @Resource
     private MsPaperStudentQuestionScoreService msPaperStudentQuestionScoreService;
@@ -34,24 +39,24 @@ public class MsPaperStudentQuestionScoreController {
     @PostMapping("/save")
     public ResultVo save(@RequestBody MsPaperStudentQuestionScore msPaperStudentQuestionScore) {
         msPaperStudentQuestionScoreService.add(msPaperStudentQuestionScore);
-        return new ResultVo(0, "保存成功！");
+        return new ResultVo(0, "保存成功");
     }
 
-    /**
-     * @Description 列表
-     * @Param [msPaperStudentQuestionScore]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return com.xhkjedu.vo.ResultVo
+    /*
+     * @Description 修改分数-修改历史
+     * @Date 2024/11/11 17:57:01
+     * @Author WN
+     * @Param [cs]
+     * @Return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/list")
-    public ResultVo queryList(@RequestBody MsPaperStudentQuestionScore msPaperStudentQuestionScore) {
-        Integer page = msPaperStudentQuestionScore.getPage();
-        Integer size = msPaperStudentQuestionScore.getPageSize();
-        N_Utils.validation(new Object[]{page, "显示页码", 1, size, "显示条数", 1});
+    public ResultVo queryList(@RequestBody MsClassStudent cs) {
+        Integer page = cs.getPage();
+        Integer size = cs.getPageSize();
+        N_Utils.validation(new Object[]{page, "显示页码", 1, size, "显示条数", 1,cs.getExamid(),"考试id",1});
         PageHelper.startPage(page, size);
-        List<MsPaperStudentQuestionScore> list = msPaperStudentQuestionScoreService.queryList(msPaperStudentQuestionScore);
+        List<Map<String, Object>> list = msPaperStudentQuestionScoreService.listStuQuestionScore(cs);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
-        return new ResultVo(0, "查询成功！", pageResult);
+        return new ResultVo(0, "获取成功", pageResult);
     }
 }

smarking/src/main/java/com/xhkjedu/smarking/controller/stupaper/MsPaperStudentScoreController.java

@@ -0,0 +1,144 @@
+package com.xhkjedu.smarking.controller.stupaper;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xhkjedu.smarking.model.exam.MsClassStudent;
+import com.xhkjedu.smarking.model.stupaper.MsPaperStudentScore;
+import com.xhkjedu.smarking.service.stupaper.MsPaperStudentScoreService;
+import com.xhkjedu.smarking.vo.stupaper.PaperStuScoreVo;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.utils.PageUtil;
+import com.xhkjedu.vo.PageResult;
+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;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description：补录成绩
+ * @Author: WN
+ * @Date: 2024/11/12 10:57:15
+ **/
+@RestController
+@RequestMapping("/mstuc")
+public class MsPaperStudentScoreController {
+    @Resource
+    private MsPaperStudentScoreService msPaperStudentScoreService;
+
+    /*
+     * @Description 补录成绩-列表
+     * @Date 2024/11/12 11:45:44
+     * @Author WN
+     * @Param [msPaperStudentScore]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list")
+    public ResultVo list(@RequestBody MsPaperStudentScore msPaperStudentScore) {
+        N_Utils.validation(new Object[]{msPaperStudentScore.getExamid(), "考试id", 1});
+        List<Map<String, Object>> list = msPaperStudentScoreService.listPaperStudentScores(msPaperStudentScore.getExamid());
+        return new ResultVo(0, "获取成功",list);
+    }
+
+
+    /*
+     * @Description 补录成绩-保存单科
+     * @Date 2024/11/12 11:00:38
+     * @Author WN
+     * @Param [msPaperStudentScore]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/save")
+    public ResultVo save(@RequestBody MsPaperStudentScore msPaperStudentScore) {
+        N_Utils.validation(new Object[]{msPaperStudentScore.getMpsid(), "学生试卷id", 1,msPaperStudentScore.getFillscore(),"补录分数",1});
+        msPaperStudentScoreService.saveStudentScore(msPaperStudentScore);
+        return new ResultVo(0, "保存成功");
+    }
+
+    /*
+     * @Description 补录成绩-保存多科目
+     * @Date 2024/11/12 11:02:42
+     * @Author WN
+     * @Param [stuScoreVo]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/save_more")
+    public ResultVo saveMoreSubject(@RequestBody PaperStuScoreVo stuScoreVo) {
+        N_Utils.validation(new Object[]{stuScoreVo.getExamid(), "考试id", 1,stuScoreVo.getStudentid(), "学生id", 1});
+        if(N_Utils.isListEmpty(stuScoreVo.getStuscores())){
+            return new ResultVo(1, "补录科目不能为空");
+        }
+        msPaperStudentScoreService.saveBatchStudentScores(stuScoreVo);
+        return new ResultVo(0, "保存成功");
+    }
+
+    /*
+     * @Description 补录成绩-新增补录-班级学生
+     * @Date 2024/11/12 16:29:29
+     * @Author WN
+     * @Param [classStudent]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/stu")
+    public ResultVo listClassStudentForScore(@RequestBody MsClassStudent classStudent) {
+        Integer examid = classStudent.getExamid();
+        Integer classid = classStudent.getClassid();
+        N_Utils.validation(new Object[]{examid, "考试id", 1,classid, "班级id", 1});
+        List<Map<String, Object>> list = msPaperStudentScoreService.listStudentsForAdd(examid,classid);
+        return new ResultVo(0, "获取成功",list);
+    }
+
+    /*
+     * @Description 补录成绩-新增补录-学生科目分数
+     * @Date 2024/11/12 16:38:29
+     * @Author WN
+     * @Param [classStudent]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/stu_score")
+    public ResultVo listStudentSubjectScore(@RequestBody MsClassStudent classStudent) {
+        Integer examid = classStudent.getExamid();
+        Integer studentid = classStudent.getStudentid();
+        N_Utils.validation(new Object[]{examid, "考试id", 1,studentid, "学生id", 1});
+        List<Map<String, Object>> list = msPaperStudentScoreService.listStudentSubjectScores(examid,studentid);
+        return new ResultVo(0, "获取成功",list);
+    }
+
+    /*
+     * @Description 补录成绩-删除
+     * @Date 2024/11/12 15:40:59
+     * @Author WN
+     * @Param [stuScore]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/del")
+    public ResultVo deleteStuScore(@RequestBody MsPaperStudentScore stuScore) {
+        Integer examid = stuScore.getExamid();
+        Integer studentid = stuScore.getStudentid();
+        N_Utils.validation(new Object[]{examid, "考试id", 1,studentid, "学生id", 1});
+        msPaperStudentScoreService.deleteStuScore(examid,studentid);
+        return new ResultVo(0, "删除成功");
+    }
+
+    /*
+     * @Description 补录成绩-补录历史
+     * @Date 2024/11/12 11:33:02
+     * @Author WN
+     * @Param [stuScoreVo]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_history")
+    public ResultVo listStuScoreHistory(@RequestBody MsClassStudent stuScoreVo) {
+        Integer page = stuScoreVo.getPage();
+        Integer size = stuScoreVo.getPageSize();
+        N_Utils.validation(new Object[]{stuScoreVo.getExamid(), "考试id", 1,page, "显示页码", 1, size, "显示条数", 1});
+        PageHelper.startPage(page, size);
+        List<Map<String, Object>> list = msPaperStudentScoreService.listStuScoresHistory(stuScoreVo);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+        return new ResultVo(0, "获取成功",pageResult);
+    }
+}

smarking/src/main/java/com/xhkjedu/smarking/mapper/exam/SubjectScoreMapper.java

@@ -0,0 +1,29 @@
+package com.xhkjedu.smarking.mapper.exam;
+
+import com.xhkjedu.smarking.model.exam.MsClassStudent;
+import com.xhkjedu.smarking.vo.exam.MissExamVo;
+import com.xhkjedu.smarking.vo.exam.SCStudentVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description：成绩管理
+ * @Author: WN
+ * @Date: 2024/11/11 16:01:10
+ **/
+public interface SubjectScoreMapper {
+    //成绩管理-科目成绩
+    List<Map<String,Object>> listExamSubjectScore(@Param("examid") Integer examid);
+
+    //成绩管理-科目客观题主观题平均分
+    List<Map<String,Object>> listSubjectQuestionAvgScore(@Param("examid")Integer examid);
+
+    //成绩管理-缺考学生
+    List<Map<String,Object>> listSubjectMissStudents(@Param("stu") MsClassStudent stu);
+
+    //成绩管理-缺考学生导出
+    List<MissExamVo> listSubjectMissStudentExport(@Param("stu") SCStudentVo stu);
+
+}

smarking/src/main/java/com/xhkjedu/smarking/mapper/stupaper/MsPaperStudentMapper.java

@@ -4,6 +4,7 @@ import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.exam.MsClassStudent;
 import com.xhkjedu.smarking.model.paper.MsPaperQtype;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudent;
+import com.xhkjedu.smarking.model.stupaper.MsPaperStudentScore;
 import com.xhkjedu.smarking.vo.exam.CStudentVo;
 import com.xhkjedu.smarking.vo.stupaper.PaperStuExamVo;
 import org.apache.ibatis.annotations.Param;
@@ -62,7 +63,7 @@ public interface MsPaperStudentMapper extends TkMapper<MsPaperStudent> {
     Integer getNumByExamIdAndSubjectIdAndStuId(@Param("student") MsClassStudent student);
 
     //学生考试-获取开始考试学生数量
-    Integer getStartNumByExamIdExamMode(@Param("examid") Integer examid, Integer exammode);
+    Integer getStartNumByExamIdExamMode(@Param("examid") Integer examid,@Param("exammode") Integer exammode);
     //清空试卷学生信息
     int deletePaperStuByMpid(@Param("mpid") Integer mpid);
 
@@ -71,4 +72,12 @@ public interface MsPaperStudentMapper extends TkMapper<MsPaperStudent> {
     //扫描异常-缺考异常-更改状态
     int updateBatchStuPaperSstate(@Param("list") List<MsPaperStudent> paperStudents);
 
+    //补录成绩-学生科目成绩
+    List<MsPaperStudent> listPaperStudentForFillScore(@Param("examid") Integer examid,@Param("studentid") Integer studentid);
+    //补录成绩-补录单科
+    int updateStuScoreForFillScore(@Param("psc") MsPaperStudentScore psc);
+    //补录成绩-补录多科
+    int updateBatchStuScoreForFillScore(@Param("list") List<MsPaperStudentScore> list);
+    //补录成绩-清空学生补录分数
+    int updateStuScoreForRestoreFillScore(@Param("examid") Integer examid,@Param("studentid") Integer studentid);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/stupaper/MsPaperStudentQuestionScoreMapper.java

@@ -1,7 +1,12 @@
 package com.xhkjedu.smarking.mapper.stupaper;
 
 import com.xhkjedu.base.TkMapper;
+import com.xhkjedu.smarking.model.exam.MsClassStudent;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestionScore;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 阅卷学生分数修改历史表 Mapper 接口
@@ -9,4 +14,7 @@ import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestionScore;
  * @Date 2024-10-15
  */
 public interface MsPaperStudentQuestionScoreMapper extends TkMapper<MsPaperStudentQuestionScore> {
+
+    //修改分数-修改记录
+    List<Map<String, Object>> listStuQuestionScore(@Param("stu") MsClassStudent stu);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/stupaper/MsPaperStudentScoreMapper.java

@@ -0,0 +1,31 @@
+package com.xhkjedu.smarking.mapper.stupaper;
+
+import com.xhkjedu.base.TkMapper;
+import com.xhkjedu.smarking.model.exam.MsClassStudent;
+import com.xhkjedu.smarking.model.stupaper.MsPaperStudentScore;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description 阅卷学生补录成绩历史表 Mapper 接口
+ * @Author auto
+ * @Date 2024-11-11
+ */
+public interface MsPaperStudentScoreMapper extends TkMapper<MsPaperStudentScore> {
+
+    //补录成绩-列表
+    List<Map<String,Object>> listStuScores(@Param("examid")Integer examid);
+
+    //补录成绩-补录历史
+    List<Map<String,Object>> listStuScoresHistory(@Param("stu")MsClassStudent stu);
+
+    //补录成绩-删除学生补录成绩
+    int deleteStuScoreByExamid(@Param("examid")Integer examid,@Param("studentid")Integer studentid);
+
+    //补录成绩-新增补录-班级学生
+    List<Map<String,Object>> listStudentsForAdd(@Param("examid")Integer examid,@Param("classid")Integer classid);
+    //补录成绩-新增补录-学生科目分数
+    List<Map<String,Object>> listStudentSubjectScores(@Param("examid")Integer examid,@Param("studentid")Integer studentid);
+}

smarking/src/main/java/com/xhkjedu/smarking/model/stupaper/MsPaperStudentQuestionScore.java

@@ -25,14 +25,14 @@ public class MsPaperStudentQuestionScore extends BaseBean {
     private Integer studentid;
     //科目id
     private String subjectid;
-    //学生合并试题id
-    private Integer mpsqmid;
+    //学生试题id
+    private Integer mpsqid;
     //试题题号
     private String qn;
+    //修改前分值
+    private Double prescore;
     //学生原分值
     private Double stuscore;
-    //修改后分值
-    private Double upscore;
     //修改人ID
     private Integer createid;
     //修改时间

smarking/src/main/java/com/xhkjedu/smarking/model/stupaper/MsPaperStudentScore.java

@@ -0,0 +1,40 @@
+package com.xhkjedu.smarking.model.stupaper;
+
+import com.xhkjedu.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * @Description 阅卷学生补录成绩历史表
+ * @Author auto
+ * @Date 2024-11-11
+ */
+@Data
+@Table(name = "ms_paper_student_score")
+public class MsPaperStudentScore extends BaseBean {
+    @Id
+    //补录成绩历史ID
+    private Integer mpscoreid;
+    //考试id
+    private Integer examid;
+    //试卷id
+    private Integer mpid;
+    //科目id
+    private String subjectid;
+    //学生id
+    private Integer studentid;
+    //补录前分数
+    private Double fillpre;
+    //补录分数
+    private Double fillscore;
+    //创建人ID
+    private Integer createid;
+    //创建时间
+    private Integer createtime;
+
+    @Transient
+    private Integer mpsid;//学生试卷ID
+}

smarking/src/main/java/com/xhkjedu/smarking/service/exam/SubjectScoreService.java

@@ -0,0 +1,111 @@
+package com.xhkjedu.smarking.service.exam;
+
+import com.xhkjedu.smarking.mapper.exam.SubjectScoreMapper;
+import com.xhkjedu.smarking.model.exam.MsClassStudent;
+import com.xhkjedu.smarking.vo.exam.MissExamVo;
+import com.xhkjedu.smarking.vo.exam.SCStudentVo;
+import com.xhkjedu.utils.N_Utils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Description：成绩管理
+ * @Author: WN
+ * @Date: 2024/11/11 15:57:31
+ **/
+@Service
+public class SubjectScoreService {
+    @Resource
+    private SubjectScoreMapper subjectScoreMapper;
+
+
+    /*
+     * @Description 成绩管理-科目成绩列表
+     * @Date 2024/11/11 15:24:34
+     * @Author WN
+     * @Param [examid]
+     * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     **/
+    public List<Map<String, Object>> listExamSubjectScore(Integer examid){
+        //成绩管理-平均分计算：0分参与，缺考不参与
+        //科目下成绩信息
+        List<Map<String, Object>> list = subjectScoreMapper.listExamSubjectScore(examid);
+        //获取不缺考学生的所有成绩情况，计算客观题平均分、主观题平均分
+        List<Map<String,Object>> quelist = subjectScoreMapper.listSubjectQuestionAvgScore(examid);
+        for(Map<String,Object> map : list){
+            Object msid = map.get("msid");
+            Map<String,Object> queMap = quelist.stream().filter(q -> q.get("msid").equals(msid)).findFirst().orElse(null);
+            double avgobj = 0.0;
+            double avgsub = 0.0;
+            if(queMap!= null){
+                avgobj = (double) queMap.get("avgobj");
+                avgsub = (double) queMap.get("avgsub");
+            }
+            map.put("avgobj", avgobj);
+            map.put("avgsub", avgsub);
+        }
+
+        return list;
+    }
+
+    /*
+     * @Description 成绩管理-缺考学生
+     * @Date 2024/11/11 15:54:50
+     * @Author WN
+     * @Param [cvo]
+     * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     **/
+    public List<Map<String, Object>> listExamSubjectScoreByClass(MsClassStudent cvo){
+        return subjectScoreMapper.listSubjectMissStudents(cvo);
+    }
+
+    /*
+     * @Description 成绩管理-缺考学生-导出
+     * @Date 2024/11/11 16:54:12
+     * @Author WN
+     * @Param [cvo]
+     * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     **/
+    public List<Map<String, Object>> listSubjectMissStudentExport(SCStudentVo cvo){
+        List<MissExamVo> missList = subjectScoreMapper.listSubjectMissStudentExport(cvo);
+        //获取所有的科目信息
+        List<String> sublist = missList.stream().map(MissExamVo::getSubjectname).distinct().collect(Collectors.toList());
+        Map<String,List<MissExamVo>> stuMap = missList.stream().collect(Collectors.groupingBy(MissExamVo::getSubjectid));
+        List<Map<String, Object>> rtnMap = new ArrayList<>();
+
+        for(Map.Entry<String,List<MissExamVo>> entry : stuMap.entrySet()){
+            Map<String, Object> map = new LinkedHashMap<>();
+            List<MissExamVo> stuList = entry.getValue();
+            MissExamVo mevo = stuList.get(0);
+            map.put("studentid",mevo.getStudentid());
+            map.put("studentname",mevo.getStudentname());
+            map.put("classname",mevo.getClassname());
+            map.put("usersex",mevo.getUsersex());
+            map.put("examno",mevo.getExamno());
+
+            for(String subjectname : sublist){
+                MissExamVo subVo = stuList.stream().filter(vo -> vo.getSubjectname().equals(subjectname)).findFirst().orElse(null);
+                if(subVo == null){
+                    map.put(subjectname,"-");
+                }else{
+                    String str = "未上传";
+                    if(N_Utils.isTrueInteger(subVo.getBatchid())){
+                        str = "已上传";
+                    }
+
+                    map.put(subjectname,str);
+                }
+            }
+            rtnMap.add(map);
+        }
+
+        return rtnMap;
+    }
+
+}

smarking/src/main/java/com/xhkjedu/smarking/service/stupaper/MsPaperStudentQuestionScoreService.java

@@ -1,11 +1,17 @@
 package com.xhkjedu.smarking.service.stupaper;
 
+import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentQuestionMapper;
 import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentQuestionScoreMapper;
+import com.xhkjedu.smarking.model.exam.MsClassStudent;
+import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestionScore;
+import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 阅卷学生分数修改历史表 服务实现类
@@ -16,6 +22,8 @@ import java.util.List;
 public class MsPaperStudentQuestionScoreService {
     @Resource
     private MsPaperStudentQuestionScoreMapper msPaperStudentQuestionScoreMapper;
+    @Resource
+    private MsPaperStudentQuestionMapper msPaperStudentQuestionMapper;
 
     /**
      * @Description 新增
@@ -24,18 +32,29 @@ public class MsPaperStudentQuestionScoreService {
      * @Date 2024-10-15
      * @return void
      **/
+    @Transactional(rollbackFor = Exception.class)
     public void add(MsPaperStudentQuestionScore msPaperStudentQuestionScore){
-        msPaperStudentQuestionScoreMapper.insert(msPaperStudentQuestionScore);
+        //获取学生试卷试题信息
+        MsPaperStudentQuestion msPaperStudentQuestion = msPaperStudentQuestionMapper.selectByPrimaryKey(msPaperStudentQuestionScore.getMpsqsid());
+        msPaperStudentQuestionScore.setExamid(msPaperStudentQuestion.getExamid());
+        msPaperStudentQuestionScore.setMpid(msPaperStudentQuestion.getMpid());
+        msPaperStudentQuestionScore.setStudentid(msPaperStudentQuestion.getStudentid());
+        msPaperStudentQuestionScore.setQn(msPaperStudentQuestion.getQn());
+        msPaperStudentQuestionScore.setPrescore(msPaperStudentQuestion.getStuscore());
+        msPaperStudentQuestionScore.setCreatetime(N_Utils.getSecondTimestamp());
+        msPaperStudentQuestionScoreMapper.insert(msPaperStudentQuestionScore);//保存修改分数记录
+
     }
 
-    /**
-     * @Description 列表
-     * @Param [msPaperStudentQuestionScore]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return java.util.List<com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestionScore>
+
+    /*
+     * @Description 修改分数-修改记录
+     * @Date 2024/11/11 17:54:16
+     * @Author WN
+     * @Param [student]
+     * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
      **/
-    public List<MsPaperStudentQuestionScore> queryList(MsPaperStudentQuestionScore msPaperStudentQuestionScore){
-        return msPaperStudentQuestionScoreMapper.selectAll();
+    public List<Map<String,Object>> listStuQuestionScore(MsClassStudent student){
+        return msPaperStudentQuestionScoreMapper.listStuQuestionScore(student);
     }
 }

smarking/src/main/java/com/xhkjedu/smarking/service/stupaper/MsPaperStudentScoreService.java

@@ -0,0 +1,149 @@
+package com.xhkjedu.smarking.service.stupaper;
+
+import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentMapper;
+import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentScoreMapper;
+import com.xhkjedu.smarking.model.exam.MsClassStudent;
+import com.xhkjedu.smarking.model.stupaper.MsPaperStudent;
+import com.xhkjedu.smarking.model.stupaper.MsPaperStudentScore;
+import com.xhkjedu.smarking.vo.stupaper.PaperStuScoreVo;
+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.List;
+import java.util.Map;
+
+/**
+ * @Description：补录成绩
+ * @Author: WN
+ * @Date: 2024/11/11 17:24:33
+ **/
+@Service
+public class MsPaperStudentScoreService {
+    @Resource
+    private MsPaperStudentScoreMapper msPaperStudentScoreMapper;
+    @Resource
+    private MsPaperStudentMapper msPaperStudentMapper;
+
+    /*
+     * @Description 补录成绩-列表
+     * @Date 2024/11/12 11:44:54
+     * @Author WN
+     * @Param [examid]
+     * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     **/
+    public List<Map<String,Object>> listPaperStudentScores(Integer examid){
+        return msPaperStudentScoreMapper.listStuScores(examid);
+    }
+
+    /*
+     * @Description 补录成绩-补录单科
+     * @Date 2024/11/12 9:53:21
+     * @Author WN
+     * @Param [msPaperStudentScore]
+     * @Return void
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    public void saveStudentScore(MsPaperStudentScore msPaperStudentScore){
+        MsPaperStudent paperStudent = msPaperStudentMapper.selectByPrimaryKey(msPaperStudentScore.getMpsid());
+        msPaperStudentScore.setMpid(paperStudent.getMpid());
+        msPaperStudentScore.setExamid(paperStudent.getExamid());
+        msPaperStudentScore.setSubjectid(paperStudent.getSubjectid());
+        msPaperStudentScore.setStudentid(paperStudent.getStudentid());
+        msPaperStudentScore.setFillpre(paperStudent.getStuscore());
+        msPaperStudentScore.setCreatetime(N_Utils.getSecondTimestamp());
+        msPaperStudentScoreMapper.insert(msPaperStudentScore);//保存补录历史
+        msPaperStudentMapper.updateStuScoreForFillScore(msPaperStudentScore);//修改学生分数
+    }
+
+    /*
+     * @Description 补录成绩-补录多科
+     * @Date 2024/11/12 10:20:37
+     * @Author WN
+     * @Param [list]
+     * @Return void
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    public void saveBatchStudentScores(PaperStuScoreVo stuscore){
+        //获取考试对应学生所有科目信息
+        List<MsPaperStudent> paperStudents = msPaperStudentMapper.listPaperStudentForFillScore(stuscore.getExamid(), stuscore.getStudentid());
+
+        List<MsPaperStudentScore> list = stuscore.getStuscores();
+        List<MsPaperStudentScore> saveScore = new ArrayList<>();
+        Integer timestamp = N_Utils.getSecondTimestamp();
+        for(MsPaperStudentScore pscore : list){
+            //补录分数大于0时保存
+            if(pscore.getFillscore()!=null && pscore.getFillscore()>0){
+                pscore.setCreateid(stuscore.getCreateid());
+                pscore.setCreatetime(timestamp);
+                pscore.setExamid(stuscore.getExamid());
+                pscore.setStudentid(stuscore.getStudentid());
+
+                //根据学生试卷ID获取其他信息
+                MsPaperStudent paperStudent = paperStudents.stream().filter(ps -> ps.getMpsid().equals(pscore.getMpsid())).findFirst().get();
+                pscore.setMpid(paperStudent.getMpid());
+                pscore.setSubjectid(paperStudent.getSubjectid());
+                pscore.setFillpre(paperStudent.getStuscore());
+                saveScore.add(pscore);
+            }
+        }
+
+        if(!saveScore.isEmpty()){
+            msPaperStudentScoreMapper.insertList(saveScore);//保存补录历史
+            msPaperStudentMapper.updateBatchStuScoreForFillScore(saveScore);//修改学生分数
+        }
+    }
+
+    /*
+     * @Description 补录成绩-删除
+     * @Date 2024/11/12 15:39:22
+     * @Author WN
+     * @Param [examid, studentid]
+     * @Return void
+     **/
+    public void deleteStuScore(Integer examid,Integer studentid){
+        //删除学生所有科目补录成绩
+        msPaperStudentScoreMapper.deleteStuScoreByExamid(examid,studentid);
+        //恢复学生补录成绩
+        msPaperStudentMapper.updateStuScoreForRestoreFillScore(examid,studentid);
+    }
+
+    /*
+     * @Description 补录成绩-补录记录
+     * @Date 2024/11/12 11:31:07
+     * @Author WN
+     * @Param [classStudent]
+     * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     **/
+    public List<Map<String,Object>> listStuScoresHistory(MsClassStudent classStudent){
+        return msPaperStudentScoreMapper.listStuScoresHistory(classStudent);
+    }
+
+    /*
+     * @Description 补录成绩-新增补录-班级学生
+     * @Date 2024/11/12 16:27:16
+     * @Author WN
+     * @Param [examid, classid]
+     * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     **/
+    public List<Map<String,Object>> listStudentsForAdd(Integer examid, Integer classid){
+        return msPaperStudentScoreMapper.listStudentsForAdd(examid, classid);
+    }
+
+    /*
+     * @Description 补录成绩-新增补录-学生科目分数
+     * @Date 2024/11/12 16:34:53
+     * @Author WN
+     * @Param [examid, studentid]
+     * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     **/
+    public List<Map<String,Object>> listStudentSubjectScores(Integer examid, Integer studentid){
+        return msPaperStudentScoreMapper.listStudentSubjectScores(examid, studentid);
+    }
+
+    public void saveBatch(){
+        //表格中学生在考生管理找不到时：统一成：学生不存在或没有参加本次考试
+    }
+}

smarking/src/main/java/com/xhkjedu/smarking/vo/exam/MissExamVo.java

@@ -0,0 +1,31 @@
+package com.xhkjedu.smarking.vo.exam;
+
+import lombok.Data;
+
+/**
+ * @Description：缺考学生信息
+ * @Author: WN
+ * @Date: 2024/11/11 16:17:31
+ **/
+@Data
+public class MissExamVo {
+
+    private Integer studentid;
+
+    private String studentname;
+
+    private Integer usersex;
+
+    private String classname;
+
+    private String examno;
+
+    private String subjectid;
+
+    private String subjectname;
+
+    private Integer mpsid;
+
+    private Integer batchid;
+
+}

smarking/src/main/java/com/xhkjedu/smarking/vo/stupaper/PaperStuScoreVo.java

@@ -0,0 +1,23 @@
+package com.xhkjedu.smarking.vo.stupaper;
+
+import com.xhkjedu.smarking.model.stupaper.MsPaperStudentScore;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description：学生成绩
+ * @Author: WN
+ * @Date: 2024/11/12 10:40:37
+ **/
+@Data
+public class PaperStuScoreVo {
+
+    private Integer examid;//考试ID
+
+    private Integer studentid;// 学生ID
+
+    private Integer createid;// 创建人ID
+
+    private List<MsPaperStudentScore> stuscores;//学生考试成绩列表
+}

smarking/src/main/resources/mapper/exam/MsClassStudentMapper.xml

@@ -61,7 +61,7 @@
             and es.subjectid=#{cs.subjectid}
         </if>
         <if test="cs.studentname!=null and cs.studentname!=''">
-            and (u.username like '%${cs.studentname}%' or u.studentno like '%${cs.studentname}%')
+            and (u.username like '%${cs.studentname}%' or u.examno like '%${cs.studentname}%')
         </if>
         group by es.studentid,es.subjectid
         order by es.mcsid desc
@@ -122,4 +122,6 @@
                         left join ms_paper_student ps on cs.examid=ps.examid and cs.studentid=ps.studentid
         where c.examid=#{cs.examid} and c.classid=#{cs.classid}
     </delete>
+
+
 </mapper>

smarking/src/main/resources/mapper/exam/SubjectScoreMapper.xml

@@ -0,0 +1,53 @@
+<?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.smarking.mapper.exam.SubjectScoreMapper">
+
+    <!--成绩管理-科目成绩-->
+    <select id="listExamSubjectScore" resultType="java.util.Map">
+        select s.msid,s.subjectid,s.subjectname,count(ps.mpsid) stunum,count(if(ps.sstate=3,ps.mpsid,null)) missnum,
+        max(if(ps.sstate &lt; 3,ps.stuscore,null)) maxscore,min(if(ps.sstate &lt; 3,ps.stuscore,null)) minscore,
+        ROUND(avg(if(ps.sstate &lt; 3,ps.stuscore,null)),2) avgscore
+        from ms_subject s left join ms_paper_student ps on s.msid=ps.msid
+        where s.examid=#{examid} group by s.subjectid order by s.msid
+    </select>
+
+
+    <!--成绩管理-科目客观题主观题平均分-->
+    <select id="listSubjectQuestionAvgScore" resultType="java.util.Map">
+        select ps.msid,q.subjectid,ROUND(avg(if(q.ctype in (1,2,4,5,6),q.stuscore,null)),2) avgobj,
+        ROUND(avg(if(q.ctype in (3,13,14,15),q.stuscore,null)),2) avgsub
+        from ms_paper_student_question q
+        left join ms_paper_student ps on q.mpsid=ps.mpsid
+        where ps.examid=#{examid} and ps.sstate &lt; 3 group by ps.subjectid order by ps.msid
+    </select>
+
+    <!--成绩管理-缺考学生-->
+    <select id="listSubjectMissStudents" resultType="java.util.Map">
+        select DISTINCT ps.studentid,cs.classid,u.username as studentname,u.usersex,u.examno,ps.batchid from ms_paper_student ps
+        left join ms_class_student cs on ps.studentid=cs.studentid
+        left join t_user u on cs.studentid=u.userid
+        where ps.examid=#{stu.examid} and ps.subjectid=#{stu.subjectid} and ps.sstate=3
+        <if test="stu.classid!=null and stu.classid!=0">
+            ,and cs.classid=#{stu.classid}
+        </if>
+        <if test="stu.studentname!=null and stu.studentname!=''">
+            and (u.username like concat('%', #{stu.studentname}, '%') or u.examno like concat('%',#{stu.studentname},'%')
+        </if>
+        order by cs.mcsid
+    </select>
+
+    <!--成绩管理-缺考学生-导出-->
+    <select id="listSubjectMissStudentExport" resultType="com.xhkjedu.smarking.vo.exam.MissExamVo">
+        select distinct ps.mspid,ps.batchid,ps.studentid,cs.classid,u.username studentname,u.usersex,u.examno,c.classname,ps.subjectid,s.subjectname
+        from ms_paper_student ps
+        left join ms_class_student cs on ps.studentid=cs.studentid
+        left join ms_class c on cs.classid=c.classid and ps.examid=c.examid
+        left join t_user u on cs.studentid=u.userid
+        left join ms_subject s on ps.subjectid=s.subjectid
+        where ps.examid=#{stu.examid} and ps.subjectid in
+        <foreach collection="stu.subjectids" item="s" open="(" close=")" separator=",">
+            #{s}
+        </foreach>
+        order by ps.msid,c.classtype,c.classid,c.mcid,cs.mcsid
+    </select>
+</mapper>

smarking/src/main/resources/mapper/stupaper/MsPaperStudentMapper.xml

@@ -247,5 +247,24 @@
         </foreach>
     </update>
 
+    <!--补录成绩-学生科目成绩-->
+    <select id="listPaperStudentForFillScore" resultType="com.xhkjedu.smarking.model.stupaper.MsPaperStudent">
+        select * from ms_paper_student where examid=#{examid} and studentid=#{studentid}
+    </select>
+
+    <!--补录成绩-补录单科-->
+    <update id="updateStuScoreForFillScore">
+        update ms_paper_student set stuscore=#{psc.fillscore},stuscoretype=2 where mpsid=#{psc.mpsid}
+    </update>
+    <!--补录成绩-补录多科-->
+    <update id="updateBatchStuScoreForFillScore">
+        <foreach collection="list" item="p" separator=";">
+            update ms_paper_student set stuscore=#{p.fillscore},stuscoretype=2 where mpsid=#{p.mpsid}
+        </foreach>
+    </update>
+    <!--补录成绩-清空学生补录分数-->
+    <update id="updateStuScoreForRestoreFillScore">
+        update ms_paper_student set stuscore=0.0,stuscoretype=0 where examid=#{examid} and studentid=#{studentid}
+    </update>
 
 </mapper>

smarking/src/main/resources/mapper/stupaper/MsPaperStudentQuestionScoreMapper.xml

@@ -1,4 +1,26 @@
 <?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.smarking.mapper.stupaper.MsPaperStudentQuestionScoreMapper">
+
+    <!--修改分数-修改记录-->
+    <select id="listStuQuestionScore" resultType="java.util.Map">
+        select distinct q.* ,s.subjectname,u.username as studentname,u.usersex,u.examno,c.classname
+        from ms_paper_student_question_score q
+        left join ms_subject s on q.examid=s.examid and q.subjectid=s.subjectid
+        left join t_user u on q.studentid=u.userid
+        left join ms_class_student cs on q.examid=cs.examid and q.subjectid=cs.subjectid and q.studentid=cs.studentid
+        left join ms_class c on q.examid=c.examid and q.subjectid=c.subjectid and cs.classid=c.classid
+        where q.examid=#{stu.examid}
+        <if test="stu.subjectid!=null and stu.stu.subjectid!=''">
+            and q.subjectid=#{stu.subjectid}
+        </if>
+        <if test="stu.classid!=null and stu.classid!=0">
+            and cs.classid=#{stu.classid}
+        </if>
+        <if test="stu.studentname!=null and stu.studentname!=''">
+            and (u.username like concat('%', #{stu.studentname}, '%') or u.examno like concat('%',#{stu.studentname},'%')
+        </if>
+        order by q.createtime desc,c.classtype
+    </select>
+
 </mapper>

smarking/src/main/resources/mapper/stupaper/MsPaperStudentScoreMapper.xml

@@ -0,0 +1,77 @@
+<?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.smarking.mapper.stupaper.MsPaperStudentScoreMapper">
+
+    <!--补录成绩-列表-->
+    <resultMap id="stuScoreResult" type="java.util.Map">
+        <result column="examid" property="examid" />
+        <result column="studentid" property="studentid" />
+        <result column="studentname" property="studentname" />
+        <result column="examno" property="examno" />
+        <result column="classname" property="classname" />
+        <collection property="subjects" ofType="java.util.Map" javaType="java.util.ArrayList">
+            <result column="mpsid" property="mpsid" />
+            <result column="subjectid" property="subjectid" />
+            <result column="subjectname" property="subjectname" />
+            <result column="stuscore" property="stuscore" />
+            <result column="stuscoretype" property="stuscoretype" />
+        </collection>
+    </resultMap>
+    <select id="listStuScores" resultMap="stuScoreResult">
+        select ss.studentid,ss.examid,u.username as studentname,u.examno,c.classname,
+        ps.mpsid,ps.subjectid,s.subjectname,ps.stuscore,ps.stuscoretype
+        from ms_paper_student_score ss
+        left join ms_paper_student ps on ss.examid=ps.examid and ss.studentid=ps.studentid
+        left join ms_subject s on ss.examid=s.examid and ps.subjectid=s.subjectid
+        left join t_user u on ss.studentid=u.userid
+        left join ms_class_student cs on ss.examid=cs.examid and ss.studentid=cs.studentid
+        left join ms_class c on cs.classid=c.classid
+        where ss.examid=#{examid} group by ps.mpsid order by ss.createtime desc,c.classtype
+    </select>
+
+    <!--补录成绩-补录历史-->
+    <select id="listStuScoresHistory" resultType="java.util.Map">
+        select ss.fillscore,ss.createtime,s.subjectname,ss.studentid,u.username as studentname,
+        u.usersex,u.examno,c.classname
+        from ms_paper_student_score ss
+        left join ms_subject s on ss.examid=s.examid and ss.subjectid=s.subjectid
+        left join t_user u on ss.studentid=u.userid
+        left join ms_class_student cs on ss.examid=cs.examid and ss.studentid=cs.studentid
+        left join ms_class c on cs.classid=c.classid
+        where ss.examid=#{stu.examid}
+        <if test="stu.subjectid!=null and stu.subjectid!=''">
+            and ss.subjectid=#{stu.subjectid}
+        </if>
+        <if test="stu.classid!=null and stu.classid!=0">
+            and cs.classid=#{stu.classid}
+        </if>
+        <if test="stu.studentname!=null and stu.studentname!=''">
+            and (u.username like concat('%', #{stu.studentname}, '%') or u.examno like concat('%',#{stu.studentname},'%')
+        </if>
+        order by  ss.createtime desc,c.classtype
+    </select>
+
+    <!--补录成绩-删除学生补录成绩-->
+    <delete id="deleteStuScoreByExamid">
+        delete from ms_paper_student_score where examid=#{examid} and studentid=#{studentid}
+    </delete>
+
+    <!--补录成绩-新增补录-班级学生-->
+    <select id="listStudentsForAdd" resultType="java.util.Map">
+        select * from (select cs.studentid,cs.mcsid,u.username as studentname,u.examno,
+        (select count(*) from ms_paper_student ps where ps.examid=#{examid} and ps.studentid=cs.studentid
+        and ps.stuscore=0 and ps.stuscoretype=0) haszero
+        from ms_class_student cs
+        left join t_user u on cs.studentid=u.userid
+        where cs.examid=#{examid} and cs.classid=#{classid} group by cs.studentid order by cs.mcsid ) a order by a.haszero desc,a.mcsid
+    </select>
+
+    <!--补录成绩-新增补录-学生科目分数-->
+    <select id="listStudentSubjectScores" resultType="java.util.Map">
+        select ps.mpsid,ps.stuscore,ps.stuscoretype,ps.subjectid,s.subjectname
+        from ms_paper_student ps left join ms_subject s on ps.examid=s.examid and ps.subjectid=s.subjectid
+        where ps.examid=#{examid} and ps.studentid=#{studentid} order by s.msid
+    </select>
+
+
+</mapper>