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

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

@@ -183,8 +183,7 @@ public class MsPaperStudentController {
     @PostMapping("/stu_paper")
     public ResultVo listStuPaperQtypeQueAnswerForWeb(@RequestBody MsPaperStudent paperStudent) {
         N_Utils.validation(new Object[]{paperStudent.getMpsid(), "学生试卷id", 1});
-        List<Map<String,Object>> rtnlst = msPaperStudentService.listStuPaperQtypeQueAnswerForWeb(paperStudent.getMpsid());
-        return new ResultVo(0, "查询成功", rtnlst);
+        return new ResultVo(0, "查询成功", msPaperStudentService.listStuPaperQtypeQueAnswerForWeb(paperStudent.getMpsid()));
     }
 
 }

smarking/src/main/java/com/xhkjedu/smarking/service/paper/MsPaperQtypeService.java

@@ -288,7 +288,7 @@ public class MsPaperQtypeService {
         // 更新试卷设置答案状态
         msPaperMapper.updatePaperAnswer(1, mpid);
         // 保存试卷答案
-        msPaperQtypeQuestionMapper.updateBatchQuestionAnswer(changelist);
+        if (N_Utils.isListNotEmpty(changelist)) msPaperQtypeQuestionMapper.updateBatchQuestionAnswer(changelist);
 
         // 判断考试状态是开始，已提交学生重新批阅，需要重新批阅
         PExamSubjectVo examSubjectVo = msPaperMapper.getSubjectStateByMpid(mpid);

smarking/src/main/java/com/xhkjedu/smarking/service/papercheck/MsPaperCheckService.java

@@ -42,7 +42,7 @@ public class MsPaperCheckService {
      **/
     public void add(MsPaperCheck msPaperCheck) {
         Integer checkstate = msSubjectMapper.getCheckStateByMsId(msPaperCheck.getMsid());//根据考试科目id获取阅卷状态
-        if (checkstate.equals(0)) throw new ServiceException("开始阅卷后不支持修改");
+        if (!checkstate.equals(0)) throw new ServiceException("开始阅卷后不支持修改");
         saveOrUpdate(msPaperCheck);
     }
 

smarking/src/main/java/com/xhkjedu/smarking/service/papercheck/MsPaperCheckTeacherArbitrateService.java

@@ -377,17 +377,7 @@ public class MsPaperCheckTeacherArbitrateService {
     public List<Map> getScore(MsCheckParam param) {
         List<Map> score = msPaperCheckTeacherArbitrateMapper.getScore(param);
         for (Map map : score) {
-            double diffscore1 = 0;
-            double diffscore2 = 0;
-            if (map.get("scoreway").equals(2)) {
-                Object qscore = map.get("qscore");
-                Object diffscore = map.get("diffscore");
-                double scoreDiff1 = MarkingUtil.scoreDiff(map.get("firstccore"), qscore);
-                double scoreDiff2 = MarkingUtil.scoreDiff(map.get("secondcscore"), qscore);
-                diffscore1 = MarkingUtil.sub(diffscore, scoreDiff1);
-                diffscore2 = MarkingUtil.sub(diffscore, scoreDiff2);
-            }
-            map.put("diffscore1", diffscore1);
+            double diffscore2 = MarkingUtil.scoreDiff(map.get("firstccore"), map.get("secondcscore"));
             map.put("diffscore2", diffscore2);
         }
         return score;

smarking/src/main/java/com/xhkjedu/smarking/service/report/report/MsrClassService.java

@@ -404,10 +404,10 @@ public class MsrClassService {
     //格式化科目数据列表
     private List<Map<String, Object>> formatSubjectList(StudentParams params, List<Map<String, Object>> list
             , List<String> infoFields, String[] gradeFields, String groupname) {
-        Map<Integer, List<Map>> collect = list.stream().collect(Collectors.groupingBy(
-                m -> N_Utils.obj2Int(m.get("subjectid")), LinkedHashMap::new, Collectors.toList()));
+        Map<String, List<Map>> collect = list.stream().collect(Collectors.groupingBy(
+                m -> m.get("subjectid").toString(), LinkedHashMap::new, Collectors.toList()));
         List<Map<String, Object>> result = new ArrayList<>();
-        for (Map.Entry<Integer, List<Map>> entry : collect.entrySet()) {
+        for (Map.Entry<String, List<Map>> entry : collect.entrySet()) {
             List<Map> values = entry.getValue();
             Map<String, Object> map = new LinkedHashMap<>();
             Map info = values.get(0);

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

@@ -314,7 +314,7 @@ public class MsPaperStudentService {
      * @Param [mpsid]
      * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
      **/
-    public List<Map<String,Object>> listStuPaperQtypeQueAnswerForWeb(Integer mpsid){
+    public Map<String,Object> listStuPaperQtypeQueAnswerForWeb(Integer mpsid){
         Integer papertype = msPaperMapper.getPaperTypeByMpsid(mpsid);
         List<Map<String,Object>> rtnList;
         if(papertype == 1) {
@@ -323,6 +323,9 @@ public class MsPaperStudentService {
         }else{
             rtnList = msPaperStudentQuestionMapper.listStuPaperQtypeQueAnswerForWebFj(mpsid);
         }
-        return rtnList;
+        Map<String, Object> map = new HashMap<>();
+        map.put("papertype", papertype);
+        map.put("qtypes", rtnList);
+        return map;
     }
 }

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

@@ -966,6 +966,7 @@ public class MarkingUtil {
     // 根据指定科目字段排序
     public static List<Map<String, Object>> sortBySubjectField(List<Map<String, Object>> students
             , String fieldValue, String fieldName,String groupname, Integer od,String listName) {
+        if (od == null) od = 2;
         if (N_Utils.isEmpty(fieldValue)) {
             if (od.equals(2)) {//降序
                 return students.stream().sorted(Comparator.comparing(student -> student.get(fieldName).toString(), Comparator.nullsLast(Comparator.reverseOrder()))).collect(Collectors.toList());

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

@@ -69,7 +69,8 @@
     </select>
     <!--获取考试下所有科目名称-->
     <select id="listSubjectNameByExamId" resultType="java.util.Map">
-        select distinct s.subjectid,s.subjectname,p.mpid from ms_subject s
+        select distinct s.subjectid,s.subjectname,p.mpid,s.msid
+        from ms_subject s
         left join ms_paper p on s.msid=p.msid where s.examid=#{examid} order by s.msid
     </select>
     <!--根据考试科目id获取阅卷状态-->