修改分数、导入补录成绩

smarking/pom.xml

@@ -20,6 +20,18 @@
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
 
+        <!--  导入和导出excel时需要的jar包 -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.17</version>
+        </dependency>
+
     </dependencies>
     <dependencyManagement>
         <dependencies>

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

@@ -3,8 +3,8 @@ 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.smarking.vo.stupaper.PaperStuScoreVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
@@ -37,11 +37,29 @@ public class MsPaperStudentQuestionScoreController {
      * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/save")
-    public ResultVo save(@RequestBody MsPaperStudentQuestionScore msPaperStudentQuestionScore) {
-        msPaperStudentQuestionScoreService.add(msPaperStudentQuestionScore);
+    public ResultVo save(@RequestBody PaperStuScoreVo stuscore) {
+        N_Utils.validation(new Object[]{stuscore.getMpsid(), "学生试卷id", 1});
+        if(N_Utils.isListEmpty(stuscore.getQuescores())){
+            return new ResultVo(1, "试题不能为空");
+        }
+        msPaperStudentQuestionScoreService.add(stuscore);
         return new ResultVo(0, "保存成功");
     }
 
+    /*
+     * @Description 修改分数-班级学生成绩
+     * @Date 2024/11/13 10:09:35
+     * @Author WN
+     * @Param [cs]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_stu")
+    public ResultVo listClassStudentScore(@RequestBody MsClassStudent cs) {
+        N_Utils.validation(new Object[]{cs.getExamid(), "考试id", 1, cs.getSubjectid(), "科目id", 2,cs.getClass(),"班级id",1});
+        List<Map<String, Object>> list = msPaperStudentQuestionScoreService.listClassStudentScores(cs);
+        return new ResultVo(0, "获取成功", list);
+    }
+
     /*
      * @Description 修改分数-修改历史
      * @Date 2024/11/11 17:57:01
@@ -49,7 +67,7 @@ public class MsPaperStudentQuestionScoreController {
      * @Param [cs]
      * @Return com.xhkjedu.vo.ResultVo
      **/
-    @PostMapping("/list")
+    @PostMapping("/list_history")
     public ResultVo queryList(@RequestBody MsClassStudent cs) {
         Integer page = cs.getPage();
         Integer size = cs.getPageSize();

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

@@ -10,10 +10,12 @@ import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
+import lombok.extern.slf4j.Slf4j;
 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 org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -24,6 +26,7 @@ import java.util.Map;
  * @Author: WN
  * @Date: 2024/11/12 10:57:15
  **/
+@Slf4j
 @RestController
 @RequestMapping("/mstuc")
 public class MsPaperStudentScoreController {
@@ -141,4 +144,24 @@ public class MsPaperStudentScoreController {
         PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
         return new ResultVo(0, "获取成功",pageResult);
     }
+
+    /*
+     * @Description 补录成绩-导入
+     * @Date 2024/11/13 16:09:32
+     * @Author WN
+     * @Param [stuScoreVo, file]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/save_import")
+    public ResultVo saveBatchForImport(MsPaperStudentScore stuScoreVo, MultipartFile file) {
+        N_Utils.validation(new Object[]{stuScoreVo.getExamid(), "考试id", 1});
+
+        try {
+            msPaperStudentScoreService.saveBatch(stuScoreVo, file);
+            return new ResultVo(0, "保存成功");
+        }catch (Exception e){
+            log.error("补录成绩导入失败", e.getMessage());
+            return new ResultVo(1, "保存失败");
+        }
+    }
 }

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

@@ -4,6 +4,7 @@ import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.paper.MsPaperQtypeQuestion;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentBlock;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion;
+import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestionScore;
 import com.xhkjedu.smarking.vo.stupaper.QuestionAnswerVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -45,4 +46,7 @@ public interface MsPaperStudentQuestionMapper extends TkMapper<MsPaperStudentQue
 
     //更新学生单题批阅信息
     void checkByMptqidAndStudentId(@Param("list") List<MsPaperStudentQuestion> list,@Param("block") MsPaperStudentBlock block);
+
+    //修改分数-批量修改分值
+    int updateBatchStuscore(@Param("list") List<MsPaperStudentQuestionScore> list);
 }

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

@@ -2,6 +2,7 @@ package com.xhkjedu.smarking.mapper.stupaper;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.exam.MsClassStudent;
+import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestionScore;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,4 +18,9 @@ public interface MsPaperStudentQuestionScoreMapper extends TkMapper<MsPaperStude
 
     //修改分数-修改记录
     List<Map<String, Object>> listStuQuestionScore(@Param("stu") MsClassStudent stu);
+
+    //修改分数-班级学生
+    List<Map<String, Object>> listClassStudentScores(@Param("stu") MsClassStudent stu);
+    //修改分数-学生试卷
+    List<MsPaperStudentQuestion> listStudentQuestions(@Param("mpsid") Integer mpsid);
 }

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

@@ -1,8 +1,11 @@
 package com.xhkjedu.smarking.mapper.stupaper;
 
 import com.xhkjedu.base.TkMapper;
+import com.xhkjedu.smarking.model.exam.MsClass;
 import com.xhkjedu.smarking.model.exam.MsClassStudent;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentScore;
+import com.xhkjedu.smarking.vo.exam.ESubjectVo;
+import com.xhkjedu.smarking.vo.stupaper.PaperStuScoreVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -28,4 +31,11 @@ public interface MsPaperStudentScoreMapper extends TkMapper<MsPaperStudentScore>
     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);
+
+    //补录成绩-批量新增-考试科目
+    List<ESubjectVo> listSubjectsByExamid(@Param("examid")Integer examid);
+    //补录成绩-导入-考试班级
+    List<MsClass> listClassesByExamid(@Param("examid")Integer examid);
+    //补录成绩-导入-考试学生
+    List<PaperStuScoreVo> listStudentScoreByExamid(@Param("examid")Integer examid);
 }

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

@@ -1,15 +1,18 @@
 package com.xhkjedu.smarking.service.stupaper;
 
+import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentMapper;
 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.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;
 
@@ -24,6 +27,8 @@ public class MsPaperStudentQuestionScoreService {
     private MsPaperStudentQuestionScoreMapper msPaperStudentQuestionScoreMapper;
     @Resource
     private MsPaperStudentQuestionMapper msPaperStudentQuestionMapper;
+    @Resource
+    private MsPaperStudentMapper msPaperStudentMapper;
 
     /**
      * @Description 新增
@@ -33,17 +38,53 @@ public class MsPaperStudentQuestionScoreService {
      * @return void
      **/
     @Transactional(rollbackFor = Exception.class)
-    public void add(MsPaperStudentQuestionScore 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);//保存修改分数记录
+    public void add(PaperStuScoreVo paperStuScoreVo){
+        //获取试卷中所有试题
+        List<MsPaperStudentQuestion> stuQuestions = msPaperStudentQuestionScoreMapper.listStudentQuestions(paperStuScoreVo.getMpsid());
+        List<MsPaperStudentQuestionScore> stuscores = paperStuScoreVo.getQuescores();
+        List<MsPaperStudentQuestionScore> saveStuscores = new ArrayList<>();
+        Integer timestamp = N_Utils.getSecondTimestamp();
+        Integer createid = paperStuScoreVo.getCreateid();
+
+        List<Integer> mpsids = new ArrayList<>();
+        Integer mpid = null;
+
+        for(MsPaperStudentQuestionScore stuscore : stuscores){
+            if(stuscore.getStuscore()!=null){
+
+                stuscore.setCreateid(createid);
+                stuscore.setCreatetime(timestamp);
+                MsPaperStudentQuestion ques = stuQuestions.stream().filter(q -> q.getMpsqid().equals(stuscore.getMpsqid())).findFirst().orElse(null);
+                stuscore.setMpid(ques.getMpid());
+                stuscore.setExamid(ques.getExamid());
+                stuscore.setSubjectid(ques.getSubjectid());
+                stuscore.setStudentid(ques.getStudentid());
+                stuscore.setQn(ques.getQn());
+                stuscore.setPrescore(ques.getStuscore());
+                saveStuscores.add(stuscore);
+                mpsids.add(ques.getMpsid());
+                mpid = ques.getMpid();
+            }
+        }
+
+        if(N_Utils.isListNotEmpty(saveStuscores)){
+            msPaperStudentQuestionScoreMapper.insertList(saveStuscores);
+            //修改学生试题分数
+            msPaperStudentQuestionMapper.updateBatchStuscore(saveStuscores);
+            //批量修改学生试卷总分
+            msPaperStudentMapper.updateBathStudentPaperScoreByMpsid(mpid, mpsids);
+        }
+    }
 
+    /*
+     * @Description 修改分数-班级学生
+     * @Date 2024/11/13 9:58:55
+     * @Author WN
+     * @Param [student]
+     * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     **/
+    public List<Map<String,Object>> listClassStudentScores(MsClassStudent student){
+        return msPaperStudentQuestionScoreMapper.listClassStudentScores(student);
     }
 
 

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

@@ -2,16 +2,21 @@ 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.MsClass;
 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.utils.ImportUtil;
+import com.xhkjedu.smarking.vo.exam.ESubjectVo;
 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 org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -143,7 +148,24 @@ public class MsPaperStudentScoreService {
         return msPaperStudentScoreMapper.listStudentSubjectScores(examid, studentid);
     }
 
-    public void saveBatch(){
+    @Transactional(rollbackFor = Exception.class)
+    public void saveBatch(MsPaperStudentScore mpstuScore, MultipartFile file) throws Exception{
         //表格中学生在考生管理找不到时：统一成：学生不存在或没有参加本次考试
+
+        //获取考试的所有科目
+        List<ESubjectVo> subjects = msPaperStudentScoreMapper.listSubjectsByExamid(mpstuScore.getExamid());
+        Map<String,ESubjectVo> subjectMap = subjects.stream().collect(HashMap::new, (m,v)->m.put(v.getSubjectid(),v), HashMap::putAll);
+        //考试班级
+        List<MsClass> classes = msPaperStudentScoreMapper.listClassesByExamid(mpstuScore.getExamid());
+        List<String> classNames = classes.stream().map(MsClass::getClassname).collect(ArrayList::new, ArrayList::add, ArrayList::addAll);
+        //获取考试的所有学生
+        List<PaperStuScoreVo> allStudents = msPaperStudentScoreMapper.listStudentScoreByExamid(mpstuScore.getExamid());
+        Map<String,PaperStuScoreVo> stuMap = allStudents.stream().collect(HashMap::new, (m,v)->m.put(v.getExamno(),v), HashMap::putAll);
+
+        List<MsPaperStudentScore> saveScore = ImportUtil.readExcelStudentScore(file, subjectMap, stuMap,classNames, mpstuScore.getCreateid());
+        if(!saveScore.isEmpty()){
+            msPaperStudentScoreMapper.insertList(saveScore);//保存补录历史
+            msPaperStudentMapper.updateBatchStuScoreForFillScore(saveScore);//修改学生得分
+        }
     }
 }

smarking/src/main/java/com/xhkjedu/smarking/utils/ImportUtil.java

@@ -0,0 +1,303 @@
+package com.xhkjedu.smarking.utils;
+
+import com.xhkjedu.smarking.model.stupaper.MsPaperStudentScore;
+import com.xhkjedu.smarking.vo.exam.ESubjectVo;
+import com.xhkjedu.smarking.vo.stupaper.PaperStuScoreVo;
+import com.xhkjedu.utils.N_Utils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.InputStream;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/*
+ * @Description:导入
+ * @Author: WN
+ * @Date: 2024/11/13 11:31:52
+ **/
+@Component
+@Slf4j
+public class ImportUtil {
+    //2003- 版本的excel
+    private final static String excel2003L = ".xls";
+    //2007+ 版本的excel
+    private final static String excel2007U = ".xlsx";
+
+
+    public static List<MsPaperStudentScore> readExcelStudentScore(MultipartFile file, Map<String,ESubjectVo> subjectMap,Map<String,PaperStuScoreVo> stuMap,List<String> classNames,Integer createid) throws Exception {
+        List<MsPaperStudentScore> rtnList = new ArrayList<>();//需要保存的学生分数
+        Integer timestamp = N_Utils.getSecondTimestamp();
+
+        try {
+            // 数据校验
+            isExcelEmpty(file);
+            InputStream in = file.getInputStream();
+            String fileName = file.getOriginalFilename();
+            Workbook work = getWorkbook(in, fileName);
+            //遍历所有sheet
+            for (int i = 0; i < work.getNumberOfSheets(); i++) {
+                Sheet sheet = work.getSheetAt(i);
+                int rows = sheet.getLastRowNum(); // 获取最后一个实际行的下标，比行数小1
+                String sheetName = sheet.getSheetName();//根据sheet名称获取科目信息
+                //获取科目信息
+                if(!subjectMap.containsKey(sheetName)) throw new Exception("科目信息不存在");
+
+                ESubjectVo subject = subjectMap.get(sheetName);//sheet对应科目信息
+
+                int firstRowNum = sheet.getFirstRowNum(); // 获取第一个实际行的下标，（firstRowNum=0）
+                Row row = sheet.getRow(firstRowNum);//标题行
+                String titleName = "姓名性别班级准考证号补录成绩";//标题格式
+                StringBuilder sb = new StringBuilder();
+                sb.append(row.getCell(0));//姓名
+                sb.append(row.getCell(1));//性别
+                sb.append(row.getCell(2));//班级
+                sb.append(row.getCell(3));//准考证号
+                sb.append(row.getCell(4));//补录成绩
+                String importTitleName = sb.toString().replaceAll(" |（必填）", "");
+                if(!titleName.equals(importTitleName)) throw new Exception("标题格式不正确");
+
+                Map<String, String> nameMap = new HashMap<>();
+
+                /*
+                 * 遍历当前sheet中的所有行
+                 * 排除第一行  第一行为标题头 不纳入遍历
+                 */
+                for (int x = firstRowNum + 1; x <= rows; x++) {
+                    // 获取行
+                    row = sheet.getRow(x);
+                    if (row == null) {//若此行为空，则跳出循环继续下一行
+                        continue;
+                    } else if (isEmptyCell(row.getCell(0)) && isEmptyCell(row.getCell(1))) {
+                        continue;
+                    }
+                    PaperStuScoreVo stu = new PaperStuScoreVo();// 每一行一个学生信息
+                    int firstCellNum = row.getFirstCellNum();// 每一行的第一列，（firstCellNum=0）
+                    if (firstCellNum == 1) throw new Exception("第" + (x + 1) + "行姓名不能为空");
+                    int lastCellNum = row.getLastCellNum();// 每一行的最后一列，获取列数，比最后一列列标大1
+                    //遍历所有的列
+                    for (int y = firstCellNum; y < lastCellNum; y++) {
+                        Cell cell = row.getCell(y);
+                        if (y == 0) {   // 姓名
+                            if (isEmptyCell(cell)) {
+                                throw new Exception("第" + (x + 1) + "行姓名不能为空");
+                            } else {
+                                stu.setStudentname(getCellValue(cell));
+                            }
+                        } else if (y == 1) {//性别
+                            if (isEmptyCell(cell)) {
+                                stu.setUsersex(0);
+                            } else {
+                                String usersex = getCellValue(cell);
+                                if (usersex.equals("女")) {
+                                    stu.setUsersex(2);
+                                } else if (usersex.equals("男")) {
+                                    stu.setUsersex(1);
+                                } else {
+                                    stu.setUsersex(0);
+                                }
+                            }
+                        } else if (y == 2) {//班级
+                            if (isEmptyCell(cell)) {
+                                throw new Exception("第" + (x + 1) + "行班级不能为空");
+                            } else {
+                                String classname = getCellValue(cell);
+                                if(!classNames.contains(classname)){
+                                    throw new Exception("第" + (x + 1) + "行班级不存在");
+                                }else{
+                                    stu.setClassname(classname);
+                                }
+                            }
+                        } else if (y == 3) {//准考证号
+                            if (isEmptyCell(cell)) {
+                                throw new Exception("第" + (x + 1) + "行准考证号不能为空");
+                            } else {
+                                String examno = getCellValue(cell);
+                                if(!stuMap.containsKey(examno)) {
+                                    throw new Exception("第" + (x + 1) + "行准考证号不存在");
+                                }else{
+                                    stu.setExamno(examno);
+                                }
+
+                            }
+                        } else if (y == 4) {//补录成绩
+                            String fillScore = getCellValue(cell);
+                            if(N_Utils.isEmpty(fillScore)){
+                                stu.setStuscore(null);
+                            }else{
+                                stu.setStuscore(Double.parseDouble(fillScore));
+                            }
+                        }
+                    }
+                    //判断学生信息对应用户是否存在
+                    PaperStuScoreVo oldStu = stuMap.get(stu.getExamno());
+                    if(stu.getStuscore() !=null && oldStu.getStuscoretype() != 1){
+                        //说明设置了分数，则进行用户其他信息教研
+                        if(!stu.getStudentname().equals(oldStu.getStudentname()) || !stu.getClassname().equals(oldStu.getClassname())){
+                            throw new Exception("第" + (x + 1) + "行学生不存在或没有参加本次考试");
+                        }else{
+                            MsPaperStudentScore score = setPaperStudentScore(oldStu,subject.getSubjectid(),stu.getStuscore(),createid,timestamp);
+                            rtnList.add(score);
+                        }
+                    }
+                }
+            }
+
+        } catch (Exception e) {
+            log.error("读取Excel文件失败", e.getMessage());
+            throw new Exception("读取Excel文件失败");
+        }
+        return rtnList;
+    }
+
+    private static MsPaperStudentScore setPaperStudentScore(PaperStuScoreVo oldStu, String subjectid, double stuscore, Integer createid, Integer timestamp) {
+        MsPaperStudentScore stuScore = new MsPaperStudentScore();
+        stuScore.setExamid(oldStu.getExamid());
+        stuScore.setMpid(oldStu.getMpid());
+        stuScore.setSubjectid(subjectid);
+        stuScore.setStudentid(oldStu.getStudentid());
+        stuScore.setFillpre(oldStu.getStuscore());
+        stuScore.setFillscore(stuscore);
+        stuScore.setCreateid(createid);
+        stuScore.setCreatetime(timestamp);
+        return stuScore;
+    }
+
+
+    /**
+     * 根据文件后缀，自适应上传文件的版本
+     *
+     * @return org.apache.poi.ss.usermodel.Workbook
+     * @Param [inStr, fileName]
+     * @Author ywx
+     * @Date 2020/6/3 16:42
+     **/
+    public static Workbook getWorkbook(InputStream inStr, String fileName) throws Exception {
+        Workbook wb;
+        String fileType = fileName.substring(fileName.lastIndexOf("."));
+        if (excel2003L.equals(fileType)) {
+            wb = new HSSFWorkbook(inStr);  //2003-
+        } else if (excel2007U.equals(fileType)) {
+            wb = new XSSFWorkbook(inStr);  //2007+
+        } else {
+            throw new Exception("Excel格式解析有误！");
+        }
+        return wb;
+    }
+
+    /**
+     * 判断单元格是否是空值
+     *
+     * @return java.lang.Boolean
+     * @Param [cell]
+     * @Author ywx
+     * @Date 2020/6/3 16:37
+     **/
+    public static Boolean isEmptyCell(Cell cell) {
+        if (cell != null) {
+            Boolean rtn = true;
+            if (N_Utils.isNotEmpty(getCellValue(cell))) {
+                rtn = false;
+            }
+            return rtn;
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * 对表格中数值进行格式化
+     *
+     * @return java.lang.Object
+     * @Param [cell]
+     * @Author ywx
+     * @Date 2020/6/3 16:41
+     **/
+    public static String getCellValue(Cell cell) {
+        String value = null;
+        if (cell == null) return value;
+        DecimalFormat df = new DecimalFormat("0");  //格式化number String字符
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");  //日期格式化
+        DecimalFormat df2 = new DecimalFormat("0");  //格式化数字
+        switch (cell.getCellTypeEnum()) {
+            case STRING:
+                value = cell.getRichStringCellValue().getString();
+                break;
+            case NUMERIC:
+                String cellStyle = cell.getCellStyle().getDataFormatString();
+                if ("General".equals(cellStyle)) {
+                    Double d = cell.getNumericCellValue();
+                    if (d.toString().contains("E")) {
+                        cell.setCellType(CellType.STRING);
+                        value = cell.getStringCellValue();
+                    } else {
+                        value = df.format(d);
+                    }
+                } else if ("m/d/yy".equals(cellStyle)) {
+                    value = sdf.format(cell.getDateCellValue());
+                } else {
+                    // 处理数字单元格，可能是整数或双精度浮点数
+                    if (cell.getCellStyle().getDataFormat() == 0) {
+                        // 假定没有特殊的数字格式，则处理为双精度浮点数
+                        value = cell.getNumericCellValue()+"";
+                    } else {
+                        value = df2.format(cell.getNumericCellValue());
+                    }
+                }
+                break;
+            case BOOLEAN:
+                boolean rtn = cell.getBooleanCellValue();
+                if (rtn) {
+                    value = "1";//真
+                } else {
+                    value = "0";//假
+                }
+                break;
+            case BLANK:
+                value = "";
+                break;
+            case FORMULA://读取excel公式的值
+                try {
+                    value = String.valueOf(cell.getNumericCellValue());
+                } catch (IllegalStateException e) {
+                    value = String.valueOf(cell.getRichStringCellValue());
+                }
+                break;
+            default:
+                break;
+        }
+        return N_Utils.strTrim(value);
+    }
+
+    /**
+     * 检验Excel内容是否为空
+     *
+     * @return void
+     * @Param [file]
+     * @Author ywx
+     * @Date 2020/6/3 16:36
+     **/
+    public static void isExcelEmpty(MultipartFile file) throws Exception {
+        if (null == file || file.isEmpty()) {
+            throw new Exception("文件不存在！");
+        }
+        InputStream in = file.getInputStream();
+        String fileName = file.getOriginalFilename();
+        Workbook work = getWorkbook(in, fileName);
+        if (null == work) {
+            throw new Exception("Excel内容为空！");
+        }
+        Integer sheet_size = work.getNumberOfSheets();
+        if (sheet_size == 0) {
+            throw new Exception("Excel内容为空！");
+        }
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.xhkjedu.smarking.vo.stupaper;
 
+import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestionScore;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentScore;
 import lombok.Data;
 
@@ -19,5 +20,26 @@ public class PaperStuScoreVo {
 
     private Integer createid;// 创建人ID
 
+    private Integer mpsid;//学生试卷ID
+
     private List<MsPaperStudentScore> stuscores;//学生考试成绩列表
+
+    private List<MsPaperStudentQuestionScore> quescores;//学生试题分
+
+    private String studentname;
+
+    private Integer usersex;
+
+    private Integer classid;
+
+    private String classname;
+
+    private String examno;
+
+    private Double stuscore;
+
+    private Integer stuscoretype;//学生得分类型0默认1考试得分2补录得分
+
+    private Integer mpid;
+
 }

smarking/src/main/resources/mapper/paper/MsPaperBlockMapper.xml

@@ -19,6 +19,7 @@
             <result property="bqorder" column="bqorder"/>
             <result property="mergeqid" column="mergeqid"/>
             <result property="mergeqn" column="mergeqn"/>
+            <result property="mergescore" column="mergescore"/>
             <result property="scorestepway" column="scorestepway"/>
             <result property="scorestep" column="scorestep"/>
         </collection>
@@ -27,7 +28,7 @@
     <!--获取题块及题块下试题-->
     <select id="listPaperBlockQuestions" resultMap="paperBlockResultMap">
         select b.mblockid,b.mpid,b.blockname,b.blocktype,b.blockorder,b.bqnum,b.bqscore,
-        q.mbqid,q.mbqtype,q.mptqid,q.bqn,q.bqscore,q.bqorder,q.mergeqid,q.mergeqn,q.scorestepway,q.scorestep
+        q.mbqid,q.mbqtype,q.mptqid,q.bqn,q.bqscore,q.bqorder,q.mergeqid,q.mergeqn,q.mergescore,q.scorestepway,q.scorestep
         from ms_paper_block b
         left join ms_paper_block_question q on b.mblockid=q.mblockid
         left join ms_paper p on b.mpid=p.mpid

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

@@ -207,4 +207,11 @@
         left join ms_paper p on q.mpid=p.mpid
         where ps.mspid=1 and q.mblockid=1 order by q.mptqid
     </select>
+
+    <!--修改分数-批量修改分值-->
+    <update id="updateBatchStuscore">
+        <foreach collection="list" item="q" separator=";">
+            update ms_paper_student_question set stuscore=#{q.stuscore} where mpsqid=#{q.mpsqid}
+        </foreach>
+    </update>
 </mapper>

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

@@ -11,7 +11,7 @@
         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!=''">
+        <if test="stu.subjectid!=null and stu.subjectid!=''">
             and q.subjectid=#{stu.subjectid}
         </if>
         <if test="stu.classid!=null and stu.classid!=0">
@@ -23,4 +23,22 @@
         order by q.createtime desc,c.classtype
     </select>
 
+    <!--修改分数-班级学生-->
+    <select id="listClassStudentScores" resultType="java.util.Map">
+        select distinct ps.mpsid,ps.studentid,ps.stuscore,c.classname,u.username studentname,u.usersex,u.examno,e.gradeid
+        from ms_paper_student ps
+        left join ms_class_student cs on ps.examid=cs.examid and ps.subjectid=cs.subjectid
+        left join ms_class c on ps.examid=c.examid and ps.subjectid=c.subjectid and cs.classid=c.classid
+        left join t_user u on ps.studentid=u.userid
+        left join ms_exam e on ps.examid=e.examid
+        where ps.examid=#{stu.examid} and ps.subjectid=#{stu.subjectid} and cs.classid=#{stu.classid} order by cs.mcsid
+    </select>
+
+    <!--修改分数-学生试卷-->
+    <select id="listStudentQuestions" resultType="com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion">
+        select mpsqid,studentid,examid,mpid,subjectid,qn,qscore,stuscore from ms_paper_student_question where mpsid=#{mpsid} order by qorder
+    </select>
+
+
+
 </mapper>

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

@@ -73,5 +73,24 @@
         where ps.examid=#{examid} and ps.studentid=#{studentid} order by s.msid
     </select>
 
+    <!--补录成绩-导入-考试科目-->
+    <select id="listSubjectsByExamid" resultType="com.xhkjedu.smarking.vo.exam.ESubjectVo">
+        select subjectid,subjectname from ms_subject where examid=#{examid} order by msid
+    </select>
+    <!--补录成绩-导入-考试班级-->
+    <select id="listClassesByExamid" resultType="com.xhkjedu.smarking.model.exam.MsClass">
+        select * from ms_class where examid=#{examid} order by classtype
+    </select>
+    <!--补录成绩-导入-考试学生-->
+    <select id="listStudentScoreByExamid" resultType="com.xhkjedu.smarking.vo.stupaper.PaperStuScoreVo">
+        select distinct cs.studentid,cs.subjectid,cs.examid,cs.classid,c.classname,ps.mpsid,ps.mpid,ps.subjectid,
+        ps.stuscore,ps.stuscoretype,u.username as studentname,u.usersex,u.examno
+        from ms_class_student cs
+        left join ms_paper_student ps on ps.examid=cs.examid and ps.subjectid=cs.subjectid and ps.studentid=cs.studentid
+        left join ms_class c on ps.examid=c.examid and ps.subjectid=c.subjectid and cs.classid=c.classid
+        left join t_user u on ps.studentid=u.userid
+        where cs.examid=#{examid} order by cs.mcsid
+    </select>
+
 
 </mapper>