完善模板返回值、调整报告表

smarking/src/main/java/com/xhkjedu/smarking/controller/paper/MsTemplateController.java

@@ -36,8 +36,8 @@ public class MsTemplateController {
     @PostMapping("/list")
     public ResultVo queryList(@RequestBody MsPaper paper) {
         N_Utils.validation(new Object[]{paper.getMpid(),"试卷id",1});
-        List<Map<String,Object>> list = msTemplateService.listTemplatesByMpid(paper.getMpid());
-        return new ResultVo(0, "查询成功", list);
+        Map<String,Object> rtnMap = msTemplateService.listTemplatesByMpid(paper.getMpid());
+        return new ResultVo(0, "查询成功", rtnMap);
     }
 
     /**

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

@@ -52,7 +52,7 @@ public class MsrReportparamController {
     @PostMapping("/detail")
     public ResultVo detail(@RequestBody ReportParams gradeparam) {
         N_Utils.validation(new Object[]{gradeparam.getExamid(), "考试id", 1,gradeparam.getRpbelong(),"归属菜单",2});
-        List<MsrReportparam> rtnParams = msrReportparamService.listReportparamByRpbelong(gradeparam.getRpbelong(),gradeparam.getExamid());
+        List<MsrReportparam> rtnParams = msrReportparamService.listReportparamByRpbelong(gradeparam);
         return new ResultVo(0, "获取成功",rtnParams);
     }
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/paper/MsPaperMapper.java

@@ -69,4 +69,6 @@ public interface MsPaperMapper extends TkMapper<MsPaper> {
     int updatePaperCutState(@Param("mpid") Integer mpid, @Param("cutstate") Integer cutstate);
     //获取试卷切割状态
     Integer getPaperCutStateByMpid(@Param("mpid") Integer mpid);
+    //根据试卷ID获取科目名称和考试名称
+    Map<String,Object> getSubjectAndExamByMpid(@Param("mpid") Integer mpid);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/report/reportclass/MsrClassObjsubMapper.java → smarking/src/main/java/com/xhkjedu/smarking/mapper/report/reportclass/MsrClassQobjsubMapper.java

@@ -1,12 +1,12 @@
 package com.xhkjedu.smarking.mapper.report.reportclass;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.smarking.model.report.reportclass.MsrClassObjsub;
+import com.xhkjedu.smarking.model.report.reportclass.MsrClassQobjsub;
 
 /**
  * @Description 阅卷报告-班级客主观题分析表 Mapper 接口
  * @Author auto
  * @Date 2024-12-09
  */
-public interface MsrClassObjsubMapper extends TkMapper<MsrClassObjsub> {
+public interface MsrClassQobjsubMapper extends TkMapper<MsrClassQobjsub> {
 }

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

@@ -2,6 +2,7 @@ package com.xhkjedu.smarking.mapper.report.reportother;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.report.reportother.MsrReportparam;
+import com.xhkjedu.smarking.vo.report.reportother.ReportParams;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -14,10 +15,8 @@ import java.util.List;
 public interface MsrReportparamMapper extends TkMapper<MsrReportparam> {
 
     //获取考试指定图例对应参数
-    List<MsrReportparam> listReportparamByRpbelong(@Param("rpbelong") String rpbelong,@Param("examid") Integer examid);
+    List<MsrReportparam> listReportparamByRpbelong(@Param("rp") ReportParams reportParams);
 
     //批量删除
     int deleteBatchReportparam(@Param("list") List<Integer> list);
-
-    int getCountByExamid(@Param("examid") Integer examid);
 }

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

@@ -62,4 +62,7 @@ public interface MsPaperStudentQuestionMapper extends TkMapper<MsPaperStudentQue
     List<MsPaperStudentQuestion> listNoMergeStupic();
     //批量保存学生试题
     void saveBatchStuPaperQuestion(@Param("list") List<MsPaperStudentQuestion> list);
+
+    //获取考试所有参考学生作答情况
+    List<MsPaperStudentQuestion> listAllStuQuesByExamid(@Param("examid") Integer examid);
 }

smarking/src/main/java/com/xhkjedu/smarking/model/report/reportclass/MsrClassObjsub.java → smarking/src/main/java/com/xhkjedu/smarking/model/report/reportclass/MsrClassQobjsub.java

@@ -12,8 +12,8 @@ import javax.persistence.Table;
  * @Date 2024-12-09
  */
 @Data
-@Table(name = "msr_class_objsub")
-public class MsrClassObjsub extends BaseBean {
+@Table(name = "msr_class_qobjsub")
+public class MsrClassQobjsub extends BaseBean {
     @Id
     //阅卷报告-班级客主观题分析
     private Integer coid;
@@ -22,7 +22,7 @@ public class MsrClassObjsub extends BaseBean {
     //班级ID
     private Integer classid;
     //类型1客观题2主观题
-    private Integer cotype;
+    private Integer qtype;
     //满分
     private Double fullscore;
     //最高分

smarking/src/main/java/com/xhkjedu/smarking/model/report/reportother/MsrReportparam.java

@@ -19,8 +19,12 @@ public class MsrReportparam extends BaseBean {
     private Integer rpid;
     //考试ID
     private Integer examid;
-    //归属：allrate班级对比表综合率  gradescore分档分数线 nearline临界生群体分析 subjectshow学科考试表现
-    //  keystu重点学生信息
+
+    //归属报告模块编码：zh综合报告 xj校级报告 xk学科报告 bj班级报告 xs学生报告 mtzl命题质量报告 jxzl教学质量报告 xksy学科素养报告
+    private String reportcode;
+
+    //归属：rank排行榜 scorerate班级对比得分率 allrate班级对比表综合率  allrate班级对比表综合率 quesummary试题汇总 scoresection分数分段统计
+    // rankrate名次和比例分析  gradescore分档分数线 nearline临界生群体分析 subjectshow学科考试表现 keystu重点学生信息
     private String rpbelong;
     //类型
     private Integer rptype;

smarking/src/main/java/com/xhkjedu/smarking/model/report/reportsubject/MsrSubject.java

@@ -45,6 +45,8 @@ public class MsrSubject extends BaseBean {
     private Double cyxs;
     //难度
     private Double nd;
+    //区分度
+    private Double qfd;
     //α信度系数
     private Double axdxs;
     //学科评价得分率离差

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

@@ -115,4 +115,6 @@ public class MsPaperStudentQuestion extends BaseBean {
     private String qanswer;//试题正确答案
     @Transient
     private Integer qtype;//类型1客观题2主观题
+    @Transient
+    private String mptqn;//题型题号
 }

smarking/src/main/java/com/xhkjedu/smarking/model/wholeparam/MspReportparam.java

@@ -19,8 +19,8 @@ public class MspReportparam extends BaseBean {
     private Integer rpid;
     //年级 0通用
     private Integer gradeid;
-    //归属：allrate班级对比表综合率  gradescore分档分数线 nearline临界生群体分析 subjectshow学科考试表现
-    //  keystu重点学生信息
+    //归属：rank排行榜 scorerate班级对比得分率 allrate班级对比表综合率  allrate班级对比表综合率 quesummary试题汇总 scoresection分数分段统计
+    // rankrate名次和比例分析  gradescore分档分数线 nearline临界生群体分析 subjectshow学科考试表现 keystu重点学生信息
     private String rpbelong;
     //类型
     private Integer rptype;

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

@@ -175,6 +175,9 @@ public class MsPaperQtypeService {
             qtype.setCreateid(paper.getHandleid());
             qtype.setCreatetime(paper.getHandletime());
             qtype.setMptname(N_Utils.strTrim(qtype.getMptname()));
+            if(N_Utils.isEmpty(qtype.getMptqn())){
+                qtype.setMptqn(MarkingUtil.getQnByOrder(qtype.getMptorder()));
+            }
         }
         msPaperQtypeMapper.insertList(qtypelist);// 保存题型
         List<MsPaperQtypeQuestion> qtqs = new ArrayList<>();

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

@@ -69,8 +69,10 @@ public class MsTemplateService {
      * @Param [getMpid]
      * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
      **/
-    public List<Map<String, Object>> listTemplatesByMpid(Integer getMpid){
-        return msTemplateMapper.listTemplatesByMpid(getMpid);
+    public Map<String,Object> listTemplatesByMpid(Integer mpid){
+        Map<String,Object> rtnMap = msPaperMapper.getSubjectAndExamByMpid(mpid);
+        rtnMap.put("list",msTemplateMapper.listTemplatesByMpid(mpid));
+        return rtnMap;
     }
 
     /**

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

@@ -0,0 +1,25 @@
+package com.xhkjedu.smarking.service.report.generate;
+
+import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentQuestionMapper;
+import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Description：试题对应报告内容
+ * @Author: WN
+ * @Date: 2024/12/10 10:18:26
+ **/
+@Service
+public class ReportGenerateQuestionService {
+    @Resource
+    private MsPaperStudentQuestionMapper msPaperStudentQuestionMapper;
+
+    public void generateQuestion(Integer examid){
+        //查询所有学生试题
+        List<MsPaperStudentQuestion> stuQuestions = msPaperStudentQuestionMapper.listAllStuQuesByExamid(examid);
+
+    }
+}

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

@@ -37,7 +37,7 @@ public class MsrReportparamService {
      **/
     @Transactional(rollbackFor = Exception.class)
     public void saveReportparam(ReportParams reportParams) {
-        List<MsrReportparam> originalParams = msrReportparamMapper.listReportparamByRpbelong(reportParams.getRpbelong(), reportParams.getExamid());
+        List<MsrReportparam> originalParams = msrReportparamMapper.listReportparamByRpbelong(reportParams);
 
         Integer timestamp = N_Utils.getSecondTimestamp();
         List<MsrReportparam> params = reportParams.getParams();
@@ -77,8 +77,8 @@ public class MsrReportparamService {
      * @Param [rpbelong, examid]
      * @Return java.util.List<com.xhkjedu.smarking.model.report.reportother.MsrReportparam>
      **/
-    public List<MsrReportparam> listReportparamByRpbelong(String rpbelong, Integer examid) {
-        return msrReportparamMapper.listReportparamByRpbelong(rpbelong, examid);
+    public List<MsrReportparam> listReportparamByRpbelong(ReportParams reportParams) {
+        return msrReportparamMapper.listReportparamByRpbelong(reportParams);
     }
 
     /*
@@ -88,10 +88,15 @@ public class MsrReportparamService {
      * @Param [schoolid, gradeid, examid, handleid]
      * @Return void
      **/
-    public void initReportparam(Integer schoolid,Integer gradeid,Integer examid,Integer handleid) {
+    public List<MsrReportparam> initReportparam(Integer schoolid,Integer gradeid,Integer examid,Integer handleid) {
         //初始化时判断参数是否已经存在
-        int count = msrReportparamMapper.getCountByExamid(examid);
-        if(count > 0) return;//如果已有参数不再重新保存参数
+        ReportParams ep = new ReportParams();
+        ep.setExamid(examid);
+        List<MsrReportparam> examParams = msrReportparamMapper.listReportparamByRpbelong(ep);
+        if(examParams!= null && examParams.size() > 0){
+            //说明考试已经有参数存在
+            return examParams;
+        }
 
         List<MspReportparam> mspParams = mspReportparamMapper.listAllByGrade(schoolid,gradeid);
         List<MsrReportparam> saveParams = new ArrayList<>();
@@ -121,5 +126,6 @@ public class MsrReportparamService {
             }
         }
         msrReportparamMapper.insertList(saveParams);
+        return saveParams;
     }
 }

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

@@ -363,6 +363,24 @@ public class MarkingUtil {
         return result;
     }
 
+    public static String[] qnArr = {"一","二","三","四","五","六","七","八","九","十","十一","十二","十三","十四","十五","十六","十七","十八","十九","二十",
+            "二十一","二十二","二十三","二十四","二十五","二十六","二十七","二十八","二十九","三十"};
+
+    //获取题号
+    public static String getQnByOrder(Integer qorder){
+        String rtnStr;
+        if(qorder == null || qorder == 0 || qorder > 30){
+            rtnStr = qnArr[0];
+        }
+        rtnStr = qnArr[qorder-1];
+        return rtnStr;
+    }
+
+
+
+
+
+
     public static void main(String[] args) {
         String str = "ADAC-D-(C)(AB)(CD)(ACB)BB";
 

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

@@ -15,8 +15,11 @@ public class ReportParams {
     //考试ID
     private Integer examid;
 
-    //归属：allrate班级对比表综合率  gradescore分档分数线 nearline临界生群体分析 subjectshow学科考试表现
-    //  keystu重点学生信息
+    //归属报告模块编码：zh综合报告 xj校级报告 xk学科报告 bj班级报告 xs学生报告 mtzl命题质量报告 jxzl教学质量报告 xksy学科素养报告
+    private String reportcode;
+
+    //归属：rank排行榜 scorerate班级对比得分率 allrate班级对比表综合率  allrate班级对比表综合率 quesummary试题汇总 scoresection分数分段统计
+    // rankrate名次和比例分析  gradescore分档分数线 nearline临界生群体分析 subjectshow学科考试表现 keystu重点学生信息
     private String rpbelong;
 
     //操作人ID

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

@@ -122,4 +122,11 @@
     <select id="getPaperCutStateByMpid" resultType="java.lang.Integer">
         select cutstate from ms_paper where mpid=#{mpid}
     </select>
+    <!--根据试卷ID获取科目名称和考试名称-->
+    <select id="getSubjectAndExamByMpid" resultType="java.util.Map">
+        select distinct s.msid,s.subjectname,e.examid,e.examname
+        from ms_subject s left join ms_exam e on s.examid=e.examid
+        left join ms_paper p on s.msid=p.msid
+        where p.mpid=#{mpid}
+    </select>
 </mapper>

smarking/src/main/resources/mapper/report/reportclass/MsrClassObjsubMapper.xml → smarking/src/main/resources/mapper/report/reportclass/MsrClassQobjsubMapper.xml

@@ -1,4 +1,4 @@
 <?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.report.reportclass.MsrClassObjsubMapper">
+<mapper namespace="com.xhkjedu.smarking.mapper.report.reportclass.MsrClassQobjsubMapper">
 </mapper>

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

@@ -4,7 +4,14 @@
 
     <!--获取考试对应参数-->
     <select id="listReportparamByRpbelong" resultType="com.xhkjedu.smarking.model.report.reportother.MsrReportparam">
-        select * from msr_reportparam where examid=#{examid} and rpbelong = #{rpbelong}
+        select * from msr_reportparam where examid=#{rp.examid}
+        <if test="rp.rpbelong!= null and rp.rpbelong!= ''">
+            and rpbelong = #{rp.rpbelong}
+        </if>
+        <if test="rp.reportcode!= null and rp.reportcode!= ''">
+            and reportcode = #{rp.reportcode}
+        </if>
+        order by rpid
     </select>
 
     <!--删除-->
@@ -12,9 +19,4 @@
         delete from msp_reportparam where rpid in
         <foreach collection="list" item="rpid" open="(" separator="," close=")">#{rpid}</foreach>
     </delete>
-
-    <!--获取考试参数-->
-    <select id="getCountByExamid" resultType="java.lang.Integer">
-        select count(*) from msr_reportparam where examid = #{examid}
-    </select>
 </mapper>

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

@@ -328,14 +328,14 @@
         </foreach>
     </insert>
 
-    <!--获取考试对应的所有参考学生考试信息-->
-    <select id="listAllStuQues" resultType="com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion">
-        select sq.mpsqid,sq.studentid,sq.subjectid,sq.mpid,sq.mpsid,sq.mptqid,sq.ctype,sq.questionid,
-               sq.qn,sq.qorder,sq.qscore,sq.answered,sq.answertype,sq.stuanswer,sq.converted,sq.answertime,
-               sq.costtime,sq.checked,sq.stuscore,sq.stumerge,sq.hasgood,sq.hasbad,q.qtype,q.qanswer
+    <!--获取考试所有参考学生作答情况-->
+    <select id="listAllStuQuesByExamid" resultType="com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion">
+        select sq.mpsqid,sq.studentid,sq.subjectid,sq.mpid,sq.mpsid,sq.mptid,sq.mptqid,sq.ctype,sq.questionid,sq.qn,sq.qorder,
+        sq.qscore,sq.answered,sq.answertype,sq.stuanswer,sq.stuscore,sq.stumerge,sq.hasgood,sq.hasbad,q.qtype,q.qanswer,qt.mptqn
         from ms_paper_student_question sq
-                 left join ms_paper_student ps on sq.mpsid=ps.mpsid
-                 left join ms_paper_qtype_question q on sq.mptqid=q.mptqid
+        left join ms_paper_student ps on sq.mpsid=ps.mpsid
+        left join ms_paper_qtype_question q on sq.mptqid=q.mptqid
+        left join ms_paper_qtype qt on q.mptid=qt.mptid
         where sq.examid=#{examid} and ps.sstate=2 order by sq.mpid,sq.studentid
     </select>
 </mapper>