试题设置难度/区分度参数，扫描添加字段处理

smarking/pom.xml

@@ -32,6 +32,12 @@
             <version>3.17</version>
         </dependency>
 
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.9.4</version>
+        </dependency>
+
     </dependencies>
     <dependencyManagement>
         <dependencies>

smarking/src/main/java/com/xhkjedu/smarking/mapper/report/reportclass/MsrClassQuestionMapper.java

@@ -4,6 +4,8 @@ import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.report.reportclass.MsrClassQuestion;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @Description 阅卷报告-班级试题小题分析表 Mapper 接口
  * @Author auto
@@ -12,4 +14,11 @@ import org.apache.ibatis.annotations.Param;
 public interface MsrClassQuestionMapper extends TkMapper<MsrClassQuestion> {
 
     void deleteReportByExamid(@Param("examid") Integer examid);
+
+    //获取考试难度和区别度数据
+    List<MsrClassQuestion> listQuestionClassForNdByExamid(@Param("examid") Integer examid);
+    //修改难度
+    void updateBatchNdById(@Param("list") List<MsrClassQuestion> list);
+    //修改区分度
+    void updateBatchQfdById(@Param("list") List<MsrClassQuestion> list);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/report/reportother/MsrReportparamMapper.java

@@ -18,4 +18,7 @@ public interface MsrReportparamMapper extends TkMapper<MsrReportparam> {
 
     //批量删除
     int deleteBatchReportparam(@Param("list") List<Integer> list);
+
+    //删除考试对应类型参数
+    int deleteByExamidAndRpbelong(@Param("examid") Integer examid, @Param("rpbelong") String rpbelong, @Param("rptype") Integer rptype);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/scan/MsScanbatchMapper.java

@@ -39,9 +39,13 @@ public interface MsScanbatchMapper extends TkMapper<MsScanbatch> {
 
     //修改扫描数量
     int updateScannum(@Param("batchid")Integer batchid);
-
+    int updateScannumAndErrornum(@Param("batchid")Integer batchid);
     //修改识别数量
     int updateIdentifynum(@Param("batchid")Integer batchid);
+    //修改缺考数量
+    int updateQknum(@Param("batchid")Integer batchid);
+    //修改违规数量
+    int updateWgnum(@Param("batchid")Integer batchid);
 
     //根据试卷ID获取考试状态和ID
     MsExam getExamStateAndId(@Param("mpid")Integer mpid);

smarking/src/main/java/com/xhkjedu/smarking/model/paper/MsPaper.java

@@ -37,14 +37,14 @@ public class MsPaper extends BaseBean {
     private Integer answered;
     //批阅设置：1按班设置2按题设置3按题块设置
     private Integer correcttype;
-    //是否有附件0没有1有附件
+    //是否有听力文件0没有1有
     private Integer hasfile;
     //听力允许播放次数0不限制
     private Integer hearnum;
     //听力题文件地址(附件试卷）
     private String hearfile;
-    //原卷切割状态0未切割1已切割
-    private Integer cutstate;
+    //原卷状态0未上传1已上传2已切割
+    private Integer yjstate;
     //创建人ID
     private Integer createid;
     //创建时间

smarking/src/main/java/com/xhkjedu/smarking/model/scan/MsScanbatch.java

@@ -30,6 +30,12 @@ public class MsScanbatch extends BaseBean {
     private Integer uploadnum;
     //识别数量
     private Integer identifynum;
+    //扫描出错数量
+    private Integer errornum;
+    //缺考数量
+    private Integer qknum;
+    //违规数量
+    private Integer wgnum;
     //创建人ID
     private Integer createid;
     //创建时间

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

@@ -107,7 +107,7 @@ public class MsExamService {
             p.setHasfile(0);
             p.setHearnum(0);
             p.setCorrecttype(0);
-            p.setCutstate(0);
+            p.setYjstate(0);
             papers.add(p);
         }
         msSubjectMapper.insertList(subjects);//考试科目

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

@@ -107,7 +107,7 @@ public class MsPaperQtypeService {
             savePaperAnalyzeForQuestion(paper);
         } else {
             List<MsPaperFile> pfiles = paper.getPfiles();// 附件
-            if (paper.getHasfile() == 1) {
+            if (paper.getYjstate() == 1) {
                 setPaperFiles(paper, pfiles, imgs);
                 msPaperFileMapper.insertList(pfiles);
             }
@@ -144,12 +144,12 @@ public class MsPaperQtypeService {
             // 获取附件为1题干的数量
             List<MsPaperFile> pfiles = paper.getPfiles().stream().filter(p -> p.getFiletype() == 1).collect(Collectors.toList());
             if (N_Utils.isListNotEmpty(pfiles)) {
-                paper.setHasfile(1);
+                paper.setYjstate(1);
             } else {
-                paper.setHasfile(0);
+                paper.setYjstate(0);
             }
         } else {
-            paper.setHasfile(0);
+            paper.setYjstate(0);
         }
         double pscore = qtypelist.stream().mapToDouble(MsPaperQtype::getMptscore).sum();
         int pnum = qtypelist.stream().mapToInt(MsPaperQtype::getMptnum).sum();
@@ -163,6 +163,10 @@ public class MsPaperQtypeService {
             paper.setAnswered(0);
         }
 
+        if(N_Utils.isNotEmpty(paper.getHearfile())){
+            paper.setHasfile(1);//说明有听力文件
+        }
+
         if (paper.getHearnum() == null) {
             paper.setHearnum(0);
         }
@@ -667,17 +671,15 @@ public class MsPaperQtypeService {
 
     // 设置附件
     private void setPaperFiles(MsPaper paper, List<MsPaperFile> pfiles, List<String> imgs) {
-        if (paper.getHasfile() == 1) {
-            int order = 1;
-            for (MsPaperFile pf : pfiles) {
-                pf.setCreateid(paper.getCreateid());
-                pf.setCreatetime(paper.getHandletime());
-                pf.setMpid(paper.getMpid());
-                pf.setFileorder(order++);
-
-                if (isImgFormatForsourcepath(pf.getSourcepath()) && !imgs.contains(pf.getSourcepath()) && pf.getFiletype() == 1) {
-                    imgs.add(pf.getSourcepath());
-                }
+        int order = 1;
+        for (MsPaperFile pf : pfiles) {
+            pf.setCreateid(paper.getCreateid());
+            pf.setCreatetime(paper.getHandletime());
+            pf.setMpid(paper.getMpid());
+            pf.setFileorder(order++);
+
+            if (isImgFormatForsourcepath(pf.getSourcepath()) && !imgs.contains(pf.getSourcepath()) && pf.getFiletype() == 1) {
+                imgs.add(pf.getSourcepath());
             }
         }
     }

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

@@ -154,7 +154,7 @@ public class MsPaperService {
                 pf.setFilepath(paperFileVo.getImgs().get(i));
             }
         }
-        paper.setHasfile(1);
+        paper.setYjstate(1);
         msPaperMapper.updateByPrimaryKeySelective(paper);
         msPaperFileMapper.insertList(pfiles);
     }

smarking/src/main/java/com/xhkjedu/smarking/service/report/generate/ReportGeneratePointService.java

@@ -24,6 +24,7 @@ import com.xhkjedu.smarking.vo.report.reportsubject.PointLevelVo;
 import com.xhkjedu.smarking.vo.report.reportsubject.PointParams;
 import com.xhkjedu.smarking.vo.report.reportsubject.PointVo;
 import com.xhkjedu.utils.N_Utils;
+import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -51,7 +52,7 @@ public class ReportGeneratePointService {
 
     //知识点分析，题库知识点按母题分析
     public void generatePoint(List<MsPaperStudentQuestion> stuSubjectQuestions, List<MsPaperQtypeQuestion> qtypeQuestions,List<MsClassStudent> classStus,
-                            List<MsrStudent> sturanks, Integer examid, String subjectid, Integer mpid, Double pscore) {
+                            List<MsrStudent> sturanks, Integer examid, String subjectid, Integer mpid, Double pscore) throws Exception {
         //获取试卷分析
         MsPaperAnalyze paperAnalyze = msPaperAnalyzeMapper.getObjByMpId(mpid);
         if(paperAnalyze == null || N_Utils.isEmpty(paperAnalyze.getPointjson())) return;
@@ -444,33 +445,42 @@ public class ReportGeneratePointService {
     //层级知识点分析--顶层和上层知识点是知识点本身
     private void pointTopAndUpForSelf(PointLevelVo firstPoint,Integer pointlevel,Map<String, List<MsrSubjectPoint>> subjectPointMap,
             Map<String, List<MsrSubjectPointSection>> pointSectionMap,Map<String, List<MsrSubjectPointRankgroup>> pointRankgroupMap,
-            List<MsrSubjectPoint> saveSubjectPoints,List<MsrSubjectPointSection> savePointSections, List<MsrSubjectPointRankgroup> savePointRankgroups){
+            List<MsrSubjectPoint> saveSubjectPoints,List<MsrSubjectPointSection> savePointSections, List<MsrSubjectPointRankgroup> savePointRankgroups) throws Exception {
 
         //知识点分析
         List<MsrSubjectPoint> subpoints = subjectPointMap.get(firstPoint.getPointid());
         for(MsrSubjectPoint subpoint : subpoints){
-            subpoint.setPointid(firstPoint.getTopPointid());
-            subpoint.setPointname(firstPoint.getPointname());
-            subpoint.setPointlevel(pointlevel);
-            saveSubjectPoints.add(subpoint);
+
+            MsrSubjectPoint subpointvo = new MsrSubjectPoint();
+            BeanUtils.copyProperties(subpointvo, subpoint);
+            subpointvo.setPointid(firstPoint.getTopPointid());
+            subpointvo.setPointname(firstPoint.getPointname());
+            subpointvo.setPointlevel(pointlevel);
+            subpointvo.setFullscore(subpoint.getFullscore());
+
+            saveSubjectPoints.add(subpointvo);
         }
 
         //分数分段
         List<MsrSubjectPointSection> sepoints = pointSectionMap.get(firstPoint.getPointid());
         for(MsrSubjectPointSection sepoint : sepoints) {
-            sepoint.setPointid(firstPoint.getTopPointid());
-            sepoint.setPointname(firstPoint.getPointname());
-            sepoint.setPointlevel(pointlevel);
-            savePointSections.add(sepoint);
+            MsrSubjectPointSection sepointvo = new MsrSubjectPointSection();
+            BeanUtils.copyProperties(sepointvo, sepoint);
+            sepointvo.setPointid(firstPoint.getTopPointid());
+            sepointvo.setPointname(firstPoint.getPointname());
+            sepointvo.setPointlevel(pointlevel);
+            savePointSections.add(sepointvo);
         }
 
         //分组分析
         List<MsrSubjectPointRankgroup> rgpoints = pointRankgroupMap.get(firstPoint.getPointid());
         for(MsrSubjectPointRankgroup rgpoint : rgpoints) {
-            rgpoint.setPointid(firstPoint.getTopPointid());
-            rgpoint.setPointname(firstPoint.getPointname());
-            rgpoint.setPointlevel(pointlevel);
-            savePointRankgroups.add(rgpoint);
+            MsrSubjectPointRankgroup rgpointvo = new MsrSubjectPointRankgroup();
+            BeanUtils.copyProperties(rgpointvo, rgpoint);
+            rgpointvo.setPointid(firstPoint.getTopPointid());
+            rgpointvo.setPointname(firstPoint.getPointname());
+            rgpointvo.setPointlevel(pointlevel);
+            savePointRankgroups.add(rgpointvo);
         }
     }
     //层级知识点分析--顶层和上层知识点下多知识点分析
@@ -580,134 +590,5 @@ public class ReportGeneratePointService {
                 saveStuPoints.add(stuPoint);
             }
         }
-
-    }
-    //处理顶级、上级知识点---已不用
-    private void handlePointLevel(Map<String,List<PointLevelVo>> pointMap,List<PointQuestionVo> pointques,List<PointStudentVo> schoolStuPoints,Integer pointlevel,List<MsrSubjectPointSection> pointSections,
-                                    List<MsPaperQtypeQuestion> qtypeQuestions,List<MsClassStudent> classStus,Integer examid,String subjectid,List<MsrStudent> sturanks,
-                                    List<MsrSubjectPoint> saveSubjectPoints,List<MsrSubjectPointSection> savePointSections,List<MsrSubjectPointRankgroup> savePointRankgroups){
-
-        //科目班级知识点情况
-        Map<String, List<MsrSubjectPoint>> subjectPointMap = saveSubjectPoints.stream().filter(p -> p.getPointlevel()==3).collect(Collectors.groupingBy(MsrSubjectPoint::getPointid));
-        //知识点学科总分区间
-        Map<String, List<MsrSubjectPointSection>> pointSectionMap = savePointSections.stream().filter(p -> p.getPointlevel()==3).collect(Collectors.groupingBy(MsrSubjectPointSection::getPointid));
-        //知识点分组
-        Map<String, List<MsrSubjectPointRankgroup>> pointRankgroupMap = savePointRankgroups.stream().filter(p -> p.getPointlevel()==3).collect(Collectors.groupingBy(MsrSubjectPointRankgroup::getPointid));
-
-        //处理上层知识点
-        for(Map.Entry<String,List<PointLevelVo>> entry : pointMap.entrySet()){
-            List<PointLevelVo> pointLevels = entry.getValue();
-            PointLevelVo firstPoint = pointLevels.get(0);
-            if(pointLevels.size() ==1){
-                //说明知识的上层知识点是知识点本身或者仅有一个知识点，则上层知识点分析和他本身的分析一致
-                //科目知识点
-                List<MsrSubjectPoint> subpoints = subjectPointMap.get(firstPoint.getPointid());
-                for(MsrSubjectPoint subpoint : subpoints){
-                    subpoint.setPointid(firstPoint.getTopPointid());
-                    subpoint.setPointname(firstPoint.getPointname());
-                    subpoint.setPointlevel(pointlevel);
-                    saveSubjectPoints.add(subpoint);
-                }
-
-                //分数分段
-                List<MsrSubjectPointSection> sepoints = pointSectionMap.get(firstPoint.getPointid());
-                for(MsrSubjectPointSection sepoint : sepoints) {
-                    sepoint.setPointid(firstPoint.getTopPointid());
-                    sepoint.setPointname(firstPoint.getPointname());
-                    sepoint.setPointlevel(pointlevel);
-                    savePointSections.add(sepoint);
-                }
-
-                //分组分析
-                List<MsrSubjectPointRankgroup> rgpoints = pointRankgroupMap.get(firstPoint.getPointid());
-                for(MsrSubjectPointRankgroup rgpoint : rgpoints) {
-                    rgpoint.setPointid(firstPoint.getTopPointid());
-                    rgpoint.setPointname(firstPoint.getPointname());
-                    rgpoint.setPointlevel(pointlevel);
-                    savePointRankgroups.add(rgpoint);
-                }
-            }else{
-                //上层知识点所包含的知识点id集合
-                List<String> pointids = pointLevels.stream().map(PointLevelVo::getPointid).collect(Collectors.toList());
-                //知识点下试题，以及学生得分
-                List<PointQuestionVo> levelPointQues = pointques.stream().filter(q -> pointids.contains(q.getPointid())).collect(Collectors.toList());
-                List<PointStudentVo> levelStuPoints = schoolStuPoints.stream().filter(q -> pointids.contains(q.getPointid())).collect(Collectors.toList());
-                List<QuestionPointVo> ques = new ArrayList<>();//知识点下所有试题
-                for(PointQuestionVo point : levelPointQues) {
-                    ques.addAll(point.getQues());
-                }
-
-                List<Integer> mptqids = ques.stream().map(QuestionPointVo::getMptqid).distinct().collect(Collectors.toList());
-                //获取试题对应的qn
-                List<MsPaperQtypeQuestion> qtypeQues =  qtypeQuestions.stream().filter(q -> mptqids.contains(q.getMptqid())).collect(Collectors.toList());
-                String qnStr = qtypeQues.stream().map(q -> q.getMptqn()  + "." + q.getQn()).collect(Collectors.joining(","));
-                String mptqidStr = mptqids.stream().map(Object::toString).collect(Collectors.joining(","));
-                double pointscore = levelPointQues.stream().mapToDouble(PointQuestionVo::getScore).sum();
-                pointscore = N_Utils.formatDouble(pointscore, 1);
-                //知识点多个试题，处理成单个学生试题总分值
-                List<PointStudentVo> pointStuScores = new ArrayList<>();//处理成学生知识点形式，后续计算使用
-                Map<Integer, List<PointStudentVo>> pointStuMap = levelStuPoints.stream().collect(Collectors.groupingBy(PointStudentVo::getStudentid));
-                for (Map.Entry<Integer, List<PointStudentVo>> psentry : pointStuMap.entrySet()){
-                    List<PointStudentVo> pstuScores = psentry.getValue();
-                    double stuScore = pstuScores.stream().mapToDouble(PointStudentVo::getStuscore).sum();
-                    stuScore = N_Utils.formatDouble(stuScore, 1);
-                    PointStudentVo pstuvo = new PointStudentVo();
-                    pstuvo.setStudentid(psentry.getKey());
-                    pstuvo.setPointid(entry.getKey());
-                    pstuvo.setStuscore(stuScore);
-                    pstuvo.setScore(pointscore);
-                    pointStuScores.add(pstuvo);
-                }
-
-                MsrSubjectPoint subjectPoint = new MsrSubjectPoint();
-                subjectPoint.setExamid(examid);
-                subjectPoint.setSubjectid(subjectid);
-                subjectPoint.setPointid(firstPoint.getTopPointid());
-                subjectPoint.setClassid(0);
-                subjectPoint.setPointname(firstPoint.getTopPointid());
-                subjectPoint.setFullscore(pointscore);
-                subjectPoint.setPointlevel(pointlevel);
-                subjectPoint.setMptqids(mptqidStr);
-                subjectPoint.setQns(qnStr);
-
-                //校知识点分析
-                MsrSubjectPoint schoolPoint = pointLevelClass(pointStuScores, subjectPoint);
-                saveSubjectPoints.add(schoolPoint);
-
-                //班级知识点分析
-                List<Integer> classIds = classStus.stream().map(MsClassStudent::getClassid).distinct().collect(Collectors.toList());
-                List<MsrSubjectPoint> classPoints = new ArrayList<>();
-                for (Integer classid : classIds) {
-                    // 获取班级下学生id
-                    List<Integer> classStuIds = classStus.stream().filter(c -> c.getClassid().equals(classid)).map(MsClassStudent::getStudentid).collect(Collectors.toList());
-                    // 获取班级下学生试题
-                    List<PointStudentVo> classStuPoints = pointStuScores.stream().filter(q -> classStuIds.contains(q.getStudentid())).collect(Collectors.toList());
-                    subjectPoint.setClassid(classid);
-                    MsrSubjectPoint classPoint = pointLevelClass(classStuPoints, subjectPoint);
-                    classPoints.add(classPoint);
-                }
-
-                // 班级知识点保存后，要对平均分排序
-                List<Double> avgScores = classPoints.stream().map(MsrSubjectPoint::getAvgscore).collect(Collectors.toList());
-                Map<Double,Integer> avgScoreRankMap = MarkingUtil.fspm(avgScores);
-                for(MsrSubjectPoint sp : classPoints){
-                    sp.setAvgrank(avgScoreRankMap.get(sp.getAvgscore()));
-                }
-                saveSubjectPoints.addAll(classPoints);
-
-                PointQuestionVo pqvo = new PointQuestionVo();
-                pqvo.setPointid(firstPoint.getTopPointid());
-                pqvo.setPointname(firstPoint.getPointname());
-                pqvo.setScore(pointscore);
-
-                //知识点结构与总分的相关性(三级知识点)
-                // List<MsrSubjectPointSection> pointSecs = pointSection(pointStuScores, pointSections, PointParams);
-                // savePointSections.addAll(pointSecs);
-
-                //知识点考生分组分析
-                List<MsrSubjectPointRankgroup> pointRankg = pointRankGroup(pointStuScores,sturanks, pqvo, examid, subjectid, pointlevel);
-                savePointRankgroups.addAll(pointRankg);
-            }
-        }
     }
 }

smarking/src/main/java/com/xhkjedu/smarking/service/report/generate/ReportGenerateQuestionService.java

@@ -27,6 +27,7 @@ import com.xhkjedu.smarking.model.report.reportsubject.MsrSubjectQuestionSection
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion;
 import com.xhkjedu.smarking.utils.MarkingUtil;
 import com.xhkjedu.smarking.vo.report.reportother.RankGroupVo;
+import com.xhkjedu.smarking.vo.report.reportother.ReportParams;
 import com.xhkjedu.smarking.vo.report.reportother.SzJsonVo;
 import com.xhkjedu.smarking.vo.report.reportsubject.SectionScoreVo;
 import com.xhkjedu.utils.N_Utils;
@@ -72,7 +73,7 @@ public class ReportGenerateQuestionService {
     private ReportGeneratePointService reportGeneratePointService;
 
     @Transactional(rollbackFor = Exception.class)
-    public void generateQuestion(Integer examid, Integer exammode) {
+    public void generateQuestion(Integer examid, Integer exammode) throws Exception {
         // 查询所有学生试题
         List<MsPaperStudentQuestion> stuQuestions = msPaperStudentQuestionMapper.listAllStuQuesByExamid(examid);
         List<MsClassStudent> classStudents = msClassStudentMapper.listStudentByExamId(examid);
@@ -107,7 +108,7 @@ public class ReportGenerateQuestionService {
             //客观题、主观题
             handleObjSub(subjectStuQuestions, subjectClassStudents, questions, subjectStuPapers, examid, subjectid,subject.getPscore());
             //知识点相关分析
-            reportGeneratePointService.generatePoint(subjectStuQuestions,questions,classStudents,subjectStuPapers,examid,subjectid,subject.getMpid(),subject.getPscore());
+            reportGeneratePointService.generatePoint(subjectStuQuestions,questions,subjectClassStudents,subjectStuPapers,examid,subjectid,subject.getMpid(),subject.getPscore());
         }
     }
 
@@ -316,10 +317,19 @@ public class ReportGenerateQuestionService {
     private String[] questionNdAndQfd(List<MsrReportparam> params, Integer rptype, Double nd) {
         // 获取难度或者区分度
         MsrReportparam ndParam = params.stream().filter(p -> p.getRptype().equals(rptype)).findFirst().orElse(null);// 难度
+        if (ndParam != null) {
+            return questionNdAndQfdComm(ndParam.getSzjson(),nd);
+        }
+        return new String[]{null, null};
+    }
+    // 单个试题分析-试题难度、区分度判断值-通用
+    private String[] questionNdAndQfdComm(String szjson,Double nd){
+        List<SzJsonVo> szList = JSON.parseArray(szjson, SzJsonVo.class);
         String ndms = "";
         String ndfw = "";
-        if (ndParam != null) {
-            List<SzJsonVo> szList = JSON.parseArray(ndParam.getSzjson(), SzJsonVo.class);
+        if(szList.isEmpty()){
+            return new String[]{null, null};
+        }else{
             for (SzJsonVo sz : szList) {
                 if (nd == 1 && sz.getMaxvalue() == 1) {
                     ndms = sz.getDjkey();
@@ -335,8 +345,8 @@ public class ReportGenerateQuestionService {
                     break;
                 }
             }
+            return new String[]{ndms, ndfw};
         }
-        return new String[]{ndms, ndfw};
     }
 
     // 单个试题分析-客观题选项情况
@@ -804,4 +814,60 @@ public class ReportGenerateQuestionService {
 
         return objSub;
     }
+
+    //设置难度/区分度描述
+    @Transactional(rollbackFor = Exception.class)
+    public void saveNdAndQfd(ReportParams reportParams){
+        List<MsrReportparam> params = reportParams.getParams();
+        if(params == null || params.isEmpty()){
+            return;
+        }
+
+        int rptype = reportParams.getRptype();//1难度 2区别度
+        //删除已存在试题汇总参数
+        msrReportparamMapper.deleteByExamidAndRpbelong(reportParams.getExamid(), reportParams.getRpbelong(),rptype);
+        //保存试题汇总参数
+        List<MsrReportparam> saveParams = new ArrayList<>();
+
+        //获取考试分析试题难易度数据
+        List<MsrClassQuestion> questions = msrClassQuestionMapper.listQuestionClassForNdByExamid(reportParams.getExamid());
+        List<MsrClassQuestion> saveQuestions = new ArrayList<>();
+
+        Integer timestamp = N_Utils.getSecondTimestamp();
+        for(MsrReportparam param : params){
+            String subjectid = param.getSubjectid();
+            MsrReportparam rp = new MsrReportparam();
+            rp.setExamid(reportParams.getExamid());
+            rp.setSubjectid(subjectid);
+            rp.setRpbelong(reportParams.getRpbelong());
+            rp.setRptype(rptype);
+            rp.setHandleid(param.getHandleid());
+            rp.setHandletime(timestamp);
+            rp.setSzjson(param.getSzjson());
+            saveParams.add(rp);
+
+            List<MsrClassQuestion> subQuestions = questions.stream().filter(q -> q.getSubjectid().equals(subjectid)).collect(Collectors.toList());
+            for(MsrClassQuestion question : subQuestions){
+                MsrClassQuestion saveQue = new MsrClassQuestion();
+                saveQue.setCqid(question.getCqid());
+                String[] ndvalues = questionNdAndQfdComm(param.getSzjson(),question.getNd());
+                if(rptype == 1){
+                    saveQue.setNdms(ndvalues[0]);
+                    saveQue.setNdfw(ndvalues[1]);
+                }else{
+                    saveQue.setQfdms(ndvalues[0]);
+                    saveQue.setQfdfw(ndvalues[1]);
+                }
+                saveQuestions.add(saveQue);
+            }
+        }
+
+        //保存参数
+        msrReportparamMapper.insertList(saveParams);
+        if(rptype == 1){
+            msrClassQuestionMapper.updateBatchNdById(saveQuestions);
+        }else {
+            msrClassQuestionMapper.updateBatchQfdById(saveQuestions);
+        }
+    }
 }

smarking/src/main/java/com/xhkjedu/smarking/service/scan/MsScanbatchPaperService.java

@@ -107,8 +107,13 @@ public class MsScanbatchPaperService {
             throw new Exception("考试已统分，禁止扫描");
         }
 
-        //保存一次，扫描次数加1
-        msScanbatchMapper.updateScannum(msScanbatchPaper.getBatchid());
+        //更改扫描出错次数
+        if(msScanbatchPaper.getHaserror() == 1){
+            msScanbatchMapper.updateScannumAndErrornum(msScanbatchPaper.getBatchid());
+        }else{
+            //保存一次，扫描次数加1
+            msScanbatchMapper.updateScannum(msScanbatchPaper.getBatchid());
+        }
 
         Integer timestamp = N_Utils.getSecondTimestamp();
         msScanbatchPaper.setCreatetime(timestamp);
@@ -188,6 +193,7 @@ public class MsScanbatchPaperService {
         }
 
         msScanbatchPaperMapper.insertUseGeneratedKeys(msScanbatchPaper);
+
         Integer mspid = msScanbatchPaper.getId();
         msScanbatchPaper.setMspid(mspid);
 
@@ -358,6 +364,13 @@ public class MsScanbatchPaperService {
         msPaperStudentQuestionMapper.updateBatchStuAnswerForScan(saveQuesList);
         msPaperStudentMapper.updateByPrimaryKeySelective(msPaperStudent);
 
+        if(msScanbatchPaper.getMissexam() == 1){
+            msScanbatchMapper.updateQknum(msScanbatchPaper.getBatchid());//更改缺考数量
+        }
+        if(msScanbatchPaper.getViolated() == 1){
+            msScanbatchMapper.updateWgnum(msScanbatchPaper.getBatchid());//更改违规数量
+        }
+
         rtnanswernum = saveQuesList.size();
 
         return rtnanswernum;

smarking/src/main/java/com/xhkjedu/smarking/service/scan/MsScanbatchService.java

@@ -43,7 +43,6 @@ public class MsScanbatchService {
             return new ResultVo(1,"考试已统分，禁止扫描");
         }
 
-
         String batchname = msScanbatch.getDevice() + "-" + msScanbatch.getMpid() + "-";
         Integer batchnum = msScanbatchMapper.getBatchNumByBatchname(batchname);
         if(!N_Utils.isTrueInteger(batchnum)){
@@ -59,6 +58,9 @@ public class MsScanbatchService {
         msScanbatch.setScannum(0);
         msScanbatch.setUploadnum(0);
         msScanbatch.setIdentifynum(0);
+        msScanbatch.setQknum(0);
+        msScanbatch.setErrornum(0);
+        msScanbatch.setWgnum(0);
         msScanbatchMapper.insertUseGeneratedKeys(msScanbatch);
 
         Map<String,Object> map = new HashMap<>();

smarking/src/main/java/com/xhkjedu/smarking/vo/report/reportother/ReportParams.java

@@ -22,6 +22,9 @@ public class ReportParams {
     // rankrate名次和比例分析  gradescore分档分数线 nearline临界生群体分析 subjectshow学科考试表现 keystu重点学生信息
     private String rpbelong;
 
+    //类型
+    private Integer rptype;
+
     //操作人ID
     private Integer handleid;
 

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

@@ -13,7 +13,7 @@
     <select id="examOverview" resultType="java.util.Map">
         select s.msid,s.subjectid,s.subjectname,s.sdate,s.begintime,s.endtime,s.msstate,s.pstate,s.ptstate,
         s.pbstate,s.checkset,s.checkstate,s.invigilatestate,p.answered,p.ptype,p.cutstate,s.teacherid,
-        u.username as teachername,p.mpid,p.hasfile,e.exammode,e.examstate,e.hashb,e.gradeid,s.leaderid,u2.username as leadername
+        u.username as teachername,p.mpid,p.yjstate,p.cutstate,e.exammode,e.examstate,e.hashb,e.gradeid,s.leaderid,u2.username as leadername
         ,if(ps.batchid is not null,ps.mpsid,null) scannum,count(ps.mpsid) stunum
         from ms_subject s left join t_user u on s.teacherid=u.userid
         left join t_user u2 on s.leaderid=u2.userid

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

@@ -4,7 +4,7 @@
 
     <!--设置试卷中试题数量-->
     <update id="updatePaperInfo">
-        update ms_paper set ptype=#{paper.ptype},pnum=#{paper.pnum},pscore=#{paper.pscore},
+        update ms_paper set ptype=#{paper.ptype},pnum=#{paper.pnum},pscore=#{paper.pscore},yjstate=#{paper.yjstate},
         hearfile=#{paper.hearfile},hearnum=#{paper.hearnum},hasfile=#{paper.hasfile},handleid=#{paper.handleid},
         handletime=#{paper.handletime} where mpid=#{paper.mpid}
     </update>
@@ -17,8 +17,8 @@
     <!--获取试卷详细信息-->
     <select id="getPaperInfoByMsid" resultType="java.util.Map">
         select s.examid,s.msid,s.subjectid,s.subjectname,s.sdate,s.begintime,s.endtime,s.pstate,
-        e.gradeid,e.examtype,e.examname,e.exammode,e.examstate,
-        p.mpid,p.ptype,p.pnum,p.pscore,u.username as teachername,u.username as handlename
+        e.gradeid,e.examtype,e.examname,e.exammode,e.examstate,p.mpid,p.ptype,p.pnum,
+        p.pscore,p.hasfile,p.hearnum,p.hearfile,p.yjstate,u.username as teachername,u.username as handlename
         from ms_subject s left join ms_paper p on s.msid=p.msid
         left join ms_exam e on s.examid=e.examid
         left join t_user u on s.teacherid=u.userid
@@ -83,7 +83,7 @@
     </select>
     <!--根据考试id和科目id获取试卷信息-->
     <select id="getPaperByExamIdAndSubjectId" resultType="com.xhkjedu.smarking.model.paper.MsPaper">
-        select mpid, examid, msid, subjectid, ptype, pnum, pscore, answered, hasfile, hearnum, hearfile
+        select mpid, examid, msid, subjectid, ptype, pnum, pscore, answered, hasfile, hearnum, hearfile,yjstate
         from ms_paper where examid=#{examid} and subjectid=#{subjectid}
     </select>
 

smarking/src/main/resources/mapper/report/reportclass/MsrClassQuestionMapper.xml

@@ -15,4 +15,22 @@
         delete from msr_subject_question_section where examid = #{examid};
     </delete>
 
+    <!--获取考试难度和区别度数据-->
+    <select id="listQuestionClassForNdByExamid" resultType="com.xhkjedu.smarking.model.report.reportclass.MsrClassQuestion">
+        select cqid,examid,subjectid,nd,ndms,ndfw,qfd,qfdms,qfdfw from msr_class_question where examid = #{examid}
+    </select>
+    <!--修改难度-->
+    <update id="updateBatchNdById">
+        <foreach collection="list" item="item" separator=";">
+            update msr_class_question set ndms = #{item.ndms},ndfw = #{item.ndfw} where cqid = #{item.cqid}
+        </foreach>
+    </update>
+
+    <!--修改区分度-->
+    <update id="updateBatchQfdById">
+        <foreach collection="list" item="item" separator=";">
+            update msr_class_question set qfdms = #{item.ndms},qfdfw = #{item.ndfw} where cqid = #{item.cqid}
+        </foreach>
+    </update>
+
 </mapper>

smarking/src/main/resources/mapper/report/reportother/MsrReportparamMapper.xml

@@ -19,4 +19,10 @@
         delete from msp_reportparam where rpid in
         <foreach collection="list" item="rpid" open="(" separator="," close=")">#{rpid}</foreach>
     </delete>
+
+    <!--删除考试对应类型参数-->
+    <delete id="deleteByExamidAndRpbelong">
+        delete from msp_reportparam where examid = #{examid} and rpbelong = #{rpbelong}
+        <if test="rptype!= null and rptype!= 0">and rptype = #{rptype}</if>
+    </delete>
 </mapper>

smarking/src/main/resources/mapper/scan/MsScanbatchMapper.xml

@@ -84,9 +84,23 @@
     <update id="updateScannum">
         update ms_scanbatch set scannum=scannum+1 where batchid=#{batchid}
     </update>
+    <!--修改扫描数量和出错数量-->
+    <update id="updateScannumAndErrornum">
+        update ms_scanbatch set scannum=scannum+1,
+        errornum=(select count(*) from ms_scanbatch_paper where batchid=#{batchid} and haserror=1
+        where batchid=#{batchid}
+    </update>
     <!--修改识别数量-->
     <update id="updateIdentifynum">
-        update ms_scanbatch_paper set identified=(select count(*) from ms_scanbatch_paper where batchid=#{batchid} and identified=1) where batchid=#{batchid} and mspid=#{mspid}
+        update ms_scanbatch set identified=(select count(*) from ms_scanbatch_paper where batchid=#{batchid} and identified=1) where batchid=#{batchid}
+    </update>
+    <!--修改缺考数量-->
+    <update id="updateQknum">
+        update ms_scanbatch_paper set errornum=(select count(*) from ms_scanbatch_paper where batchid=#{batchid} and haserror=1) where batchid=#{batchid}
+    </update>
+    <!--修改违规数量-->
+    <update id="updateWgnum">
+        update ms_scanbatch_paper set errornum=(select count(*) from ms_scanbatch_paper where batchid=#{batchid} and haserror=1) where batchid=#{batchid}
     </update>
 
     <!--根据试卷ID获取考试状态和ID-->