完善知识点后生成报告

smarking/src/main/java/com/xhkjedu/smarking/controller/report/ZhReportController.java

@@ -33,9 +33,8 @@ public class ZhReportController {
     private MsrStudentService msrStudentService;
     @Resource
     private MsrClassQuestionService msrClassQuestionService;
-
     /*
-     * @Description 校级报告-小分表-列表
+     * @Description 小分表-列表
      * @Date 2024/12/24 10:25:06
      * @Author WN
      * @Param [subject]
@@ -53,7 +52,7 @@ public class ZhReportController {
     }
 
     /*
-     * @Description 校级报告-试题汇总-全部班-科目情况
+     * @Description 试题汇总-全部班-科目情况
      * @Date 2024/12/24 14:47:43
      * @Author WN
      * @Param [subject]
@@ -67,7 +66,7 @@ public class ZhReportController {
     }
 
     /*
-     * @Description 综合报告-试题汇总表-全部分类-按小题分析
+     * @Description 试题汇总表-全部分类-按小题分析
      * @Date 2024/12/24 15:46:14
      * @Author WN
      * @Param [params]
@@ -80,7 +79,7 @@ public class ZhReportController {
     }
 
     /*
-     * @Description 综合报告-试题汇总表-全部分类-按大题分析
+     * @Description 试题汇总表-全部分类-按大题分析
      * @Date 2024/12/24 17:19:02
      * @Author WN
      * @Param [params]
@@ -93,7 +92,7 @@ public class ZhReportController {
     }
 
     /*
-     * @Description 综合报告-试题汇总表-全部分类-按主(客)题分析
+     * @Description 试题汇总表-全部分类-按主(客)题分析
      * @Date 2024/12/24 17:27:44
      * @Author WN
      * @Param [params]

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

@@ -54,5 +54,5 @@ public interface MsClassStudentMapper extends TkMapper<MsClassStudent> {
     List<Map> searchStudent(@Param("cs") CStudentVo cs);
 
     //获取考试关联学生
-    List<MsClassStudent> listStudentByExamId(@Param("examid") Integer examid);
+    List<MsClassStudent> listStudentByExamId(@Param("examid") Integer examid, @Param("subjectid") String subjectid);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/report/reportstu/MsrStudentMapper.java

@@ -15,7 +15,7 @@ import java.util.Map;
  */
 public interface MsrStudentMapper extends TkMapper<MsrStudent> {
     //获取学生考试得分和排名
-    List<MsrStudent> listStuScoreAndRankByExamid(@Param("examid") int examid);
+    List<MsrStudent> listStuScoreAndRankByExamid(@Param("examid") int examid,@Param("subjectid") String subjectid);
     //批量修改学生主观题、客观题分值
     void updateBatchObjSubScore(@Param("list") List<MsrStudent> list);
     //综合报告-小分表-学生分数排名

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

@@ -6,7 +6,6 @@ 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.paper.SQScoreVo;
-import com.xhkjedu.smarking.vo.paper.SQuestionVo;
 import com.xhkjedu.smarking.vo.stupaper.QuestionAnswerVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -66,7 +65,7 @@ public interface MsPaperStudentQuestionMapper extends TkMapper<MsPaperStudentQue
     void saveBatchStuPaperQuestion(@Param("list") List<MsPaperStudentQuestion> list);
 
     //获取考试所有参考学生作答情况
-    List<MsPaperStudentQuestion> listAllStuQuesByExamid(@Param("examid") Integer examid);
+    List<MsPaperStudentQuestion> listAllStuQuesByExamid(@Param("examid") Integer examid,@Param("subjectid")String subjectid);
 
     //获取参与统计科目单题得分情况
     List<SQScoreVo> listByMpIds(@Param("mpids") List<Integer> mpids);

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

@@ -2,13 +2,11 @@ package com.xhkjedu.smarking.service.report.generate;
 
 import com.alibaba.fastjson.JSON;
 import com.xhkjedu.smarking.mapper.paper.MsPaperAnalyzeMapper;
-import com.xhkjedu.smarking.mapper.paper.MsPaperMapper;
 import com.xhkjedu.smarking.mapper.report.reportstu.MsrStudentPointMapper;
 import com.xhkjedu.smarking.mapper.report.reportsubject.MsrSubjectPointMapper;
 import com.xhkjedu.smarking.mapper.report.reportsubject.MsrSubjectPointRankgroupMapper;
 import com.xhkjedu.smarking.mapper.report.reportsubject.MsrSubjectPointSectionMapper;
 import com.xhkjedu.smarking.model.exam.MsClassStudent;
-import com.xhkjedu.smarking.model.paper.MsPaper;
 import com.xhkjedu.smarking.model.paper.MsPaperAnalyze;
 import com.xhkjedu.smarking.model.paper.MsPaperQtypeQuestion;
 import com.xhkjedu.smarking.model.report.reportstu.MsrStudent;
@@ -17,7 +15,6 @@ import com.xhkjedu.smarking.model.report.reportsubject.MsrSubjectPoint;
 import com.xhkjedu.smarking.model.report.reportsubject.MsrSubjectPointRankgroup;
 import com.xhkjedu.smarking.model.report.reportsubject.MsrSubjectPointSection;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion;
-import com.xhkjedu.smarking.service.paper.MsPaperAnalyzeService;
 import com.xhkjedu.smarking.utils.MarkingUtil;
 import com.xhkjedu.smarking.vo.paper.QuestionPointVo;
 import com.xhkjedu.smarking.vo.report.reportother.RankGroupVo;
@@ -52,14 +49,10 @@ public class ReportGeneratePointService {
     private MsrSubjectPointRankgroupMapper msrSubjectPointRankgroupMapper;
     @Resource
     private MsrStudentPointMapper msrStudentPointMapper;
-    @Resource
-    private MsPaperMapper msPaperMapper;
-    @Resource
-    private MsPaperAnalyzeService msPaperAnalyzeService;
 
     //知识点分析，题库知识点按母题分析
     public void generatePoint(List<MsPaperStudentQuestion> stuSubjectQuestions, List<MsPaperQtypeQuestion> qtypeQuestions,List<MsClassStudent> classStus,
-                            List<MsrStudent> sturanks, Integer examid, String subjectid, Integer mpid, Double pscore) throws Exception {
+                            List<MsrStudent> sturanks, Integer examid, String subjectid, Integer mpid, Double pscore) {
         //获取试卷分析
         MsPaperAnalyze paperAnalyze = msPaperAnalyzeMapper.getObjByMpId(mpid);
         if(paperAnalyze == null || N_Utils.isEmpty(paperAnalyze.getPointjson())) return;
@@ -616,20 +609,4 @@ public class ReportGeneratePointService {
         }
     }
 
-
-    public void handleQuestionPointAndAnalyze(Integer mpid){
-        //获取试卷基础信息
-        MsPaper paper = msPaperMapper.selectByPrimaryKey(mpid);
-        //先生产学生报告
-        if(paper.getPtype() == 1){
-            msPaperAnalyzeService.savePaperAnalyzeForQuestion(paper);
-        }else{
-            msPaperAnalyzeService.savePaperAnalyzeForFj(paper);
-        }
-
-        //删除试卷试题信息
-        msrSubjectPointMapper.deletePointAnalyze(paper.getExamid(),paper.getSubjectid());
-
-
-    }
 }

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

@@ -3,6 +3,7 @@ package com.xhkjedu.smarking.service.report.generate;
 import com.alibaba.fastjson.JSON;
 import com.xhkjedu.smarking.mapper.exam.MsClassStudentMapper;
 import com.xhkjedu.smarking.mapper.exam.MsSubjectMapper;
+import com.xhkjedu.smarking.mapper.paper.MsPaperMapper;
 import com.xhkjedu.smarking.mapper.paper.MsPaperQtypeQuestionMapper;
 import com.xhkjedu.smarking.mapper.report.reportclass.MsrClassQobjsubMapper;
 import com.xhkjedu.smarking.mapper.report.reportclass.MsrClassQtypeMapper;
@@ -10,6 +11,7 @@ import com.xhkjedu.smarking.mapper.report.reportclass.MsrClassQuestionMapper;
 import com.xhkjedu.smarking.mapper.report.reportclass.MsrClassQuestionObjMapper;
 import com.xhkjedu.smarking.mapper.report.reportother.MsrReportparamMapper;
 import com.xhkjedu.smarking.mapper.report.reportstu.MsrStudentMapper;
+import com.xhkjedu.smarking.mapper.report.reportsubject.MsrSubjectPointMapper;
 import com.xhkjedu.smarking.mapper.report.reportsubject.MsrSubjectQuestionRankgroupMapper;
 import com.xhkjedu.smarking.mapper.report.reportsubject.MsrSubjectQuestionSectionMapper;
 import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentQuestionMapper;
@@ -25,6 +27,7 @@ import com.xhkjedu.smarking.model.report.reportstu.MsrStudent;
 import com.xhkjedu.smarking.model.report.reportsubject.MsrSubjectQuestionRankgroup;
 import com.xhkjedu.smarking.model.report.reportsubject.MsrSubjectQuestionSection;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion;
+import com.xhkjedu.smarking.service.paper.MsPaperAnalyzeService;
 import com.xhkjedu.smarking.utils.MarkingUtil;
 import com.xhkjedu.smarking.vo.report.reportother.RankGroupVo;
 import com.xhkjedu.smarking.vo.report.reportother.ReportParams;
@@ -71,14 +74,20 @@ public class ReportGenerateQuestionService {
     private MsrSubjectQuestionSectionMapper msrSubjectQuestionSectionMapper;
     @Resource
     private ReportGeneratePointService reportGeneratePointService;
+    @Resource
+    private MsPaperAnalyzeService msPaperAnalyzeService;
+    @Resource
+    private MsPaperMapper msPaperMapper;
+    @Resource
+    private MsrSubjectPointMapper msrSubjectPointMapper;
 
     @Transactional(rollbackFor = Exception.class)
-    public void generateQuestion(Integer examid, Integer exammode) throws Exception {
+    public void generateQuestion(Integer examid, Integer exammode) {
         // 查询所有学生试题
-        List<MsPaperStudentQuestion> stuQuestions = msPaperStudentQuestionMapper.listAllStuQuesByExamid(examid);
-        List<MsClassStudent> classStudents = msClassStudentMapper.listStudentByExamId(examid);
+        List<MsPaperStudentQuestion> stuQuestions = msPaperStudentQuestionMapper.listAllStuQuesByExamid(examid,null);
+        List<MsClassStudent> classStudents = msClassStudentMapper.listStudentByExamId(examid,null);
         List<MsPaper> subjects = msSubjectMapper.listReportSubject(examid, exammode);
-        List<MsrStudent> stuPapers = msrStudentMapper.listStuScoreAndRankByExamid(examid);
+        List<MsrStudent> stuPapers = msrStudentMapper.listStuScoreAndRankByExamid(examid,null);
         // 获取考试参数
         List<MsrReportparam> params = msrReportparamMapper.listReportparamByRpbelong(examid, "quesummary", null);
 
@@ -872,4 +881,28 @@ public class ReportGenerateQuestionService {
             msrClassQuestionMapper.updateBatchQfdById(saveQuestions);
         }
     }
+
+    //学科素养-标定知识点-保存加重新生成报告
+    @Transactional(rollbackFor = Exception.class)
+    public void handleQuestionPointAndAnalyze(Integer mpid) {
+        //保存新标定的知识点
+
+        //获取试卷基础信息
+        MsPaper paper = msPaperMapper.selectByPrimaryKey(mpid);
+        //先生产学生报告
+        if(paper.getPtype() == 1){
+            msPaperAnalyzeService.savePaperAnalyzeForQuestion(paper);
+        }else{
+            msPaperAnalyzeService.savePaperAnalyzeForFj(paper);
+        }
+
+        //删除试卷试题信息
+        msrSubjectPointMapper.deletePointAnalyze(paper.getExamid(),paper.getSubjectid());
+        //获取试卷关联学生试题
+        List<MsPaperStudentQuestion> stuQuestions = msPaperStudentQuestionMapper.listAllStuQuesByExamid(paper.getExamid(),paper.getSubjectid());
+        List<MsPaperQtypeQuestion> qtypeQuestions = msPaperQtypeQuestionMapper.listQuestionsForReport(paper.getMpid());
+        List<MsClassStudent> classStus = msClassStudentMapper.listStudentByExamId(paper.getExamid(),paper.getSubjectid());
+        List<MsrStudent> stuPapers = msrStudentMapper.listStuScoreAndRankByExamid(paper.getExamid(),paper.getSubjectid());
+        reportGeneratePointService.generatePoint(stuQuestions,qtypeQuestions,classStus,stuPapers,paper.getExamid(),paper.getSubjectid(),paper.getMpid(),paper.getPscore());
+    }
 }

smarking/src/main/java/com/xhkjedu/smarking/service/report/reportother/MsrExamService.java

@@ -93,7 +93,7 @@ public class MsrExamService {
         List<MsPaper> subjects = subjectMapper.listReportSubject(examid, exammode);//考试报告科目列表
         if (N_Utils.isListEmpty(subjects)) return;
         List<MsClass> classes = classMapper.listClassByExamId(examid);//获取考试关联班级
-        List<MsClassStudent> students = classStudentMapper.listStudentByExamId(examid);//获取考试关联学生
+        List<MsClassStudent> students = classStudentMapper.listStudentByExamId(examid,null);//获取考试关联学生
         List<Integer> mpids = new ArrayList<>();
         for (MsPaper subject : subjects) {
             Integer mpid = subject.getMpid();

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

@@ -113,6 +113,7 @@
     <select id="listStudentByExamId" resultType="com.xhkjedu.smarking.model.exam.MsClassStudent">
         select examid,subjectid,classid,studentid
         from ms_class_student where examid=#{examid}
+        <if test="subjectid!=null and subjectid!=''"> and subjectid=#{subjectid} </if>
     </select>
     <!--移除单个科目学生-->
     <delete id="deleteByStu">

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

@@ -129,4 +129,5 @@
         left join ms_paper p on s.msid=p.msid
         where p.mpid=#{mpid}
     </select>
+
 </mapper>

smarking/src/main/resources/mapper/report/reportstu/MsrStudentMapper.xml

@@ -4,6 +4,7 @@
     <!--获取学生考试得分和排名-->
     <select id="listStuScoreAndRankByExamid" resultType="com.xhkjedu.smarking.model.report.reportstu.MsrStudent">
         select rsid,examid,subjectid,classid,studentid,stuscore,classrank,schoolrank from msr_student where examid = #{examid}
+        <if test="subjectid!= null and subjectid!= ''"> and subjectid = #{subjectid}</if>
     </select>
 
     <!--批量修改学生主观题、客观题分值-->

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

@@ -329,7 +329,9 @@
         sq.qscore,sq.answered,sq.answertype,sq.stuanswer,sq.stuscore,sq.stumerge,sq.hasgood,sq.hasbad
         from ms_paper_student_question sq
         left join ms_paper_student ps on sq.mpsid=ps.mpsid
-        where sq.examid=#{examid} and ps.sstate=2 order by sq.mpid,sq.studentid
+        where sq.examid=#{examid} and ps.sstate=2
+        <if test="subjectid!=null and subjectid!=''"> and sq.subjectid=#{subjectid} </if>
+        order by sq.mpid,sq.studentid
     </select>
     <!--获取参与统计科目单题得分情况-->
     <resultMap id="subjectScore" type="com.xhkjedu.smarking.vo.paper.SQScoreVo">