fix 题目历史

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/vo/ExamVo.java

@@ -131,4 +131,13 @@ public class ExamVo {
 
 	@ApiModelProperty("历史记录状态")
 	private Integer recordStatus;
+
+	@ApiModelProperty("总分")
+	private BigDecimal totalScore;
+
+	@ApiModelProperty("试卷总题数")
+	private Long totalQuestionNum;
+
+	@ApiModelProperty("做对总题数")
+	private Long rightQuestionNum;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsAttachedVo.java

@@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.math.BigDecimal;
 import java.util.Date;
 
 
@@ -55,4 +57,13 @@ public class GoodsAttachedVo {
 
 	@ApiModelProperty("历史记录状态")
 	private Integer recordStatus;
+
+	@ApiModelProperty("总分")
+	private BigDecimal totalScore;
+
+	@ApiModelProperty("试卷总题数")
+	private Long totalQuestionNum;
+
+	@ApiModelProperty("做对总题数")
+	private Long rightQuestionNum;
 }

zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionChapterExamMapper.xml

@@ -32,6 +32,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="questionNum" column="question_num"/>
         <result property="recordId" column="record_id"/>
         <result property="recordStatus" column="record_status"/>
+        <result property="totalScore" column="total_score"/>
+        <result property="totalQuestionNum" column="total_question_num"/>
+        <result property="rightQuestionNum" column="right_question_num"/>
     </resultMap>
 
     <select id="getList" parameterType="com.zhongzheng.modules.bank.bo.QuestionChapterExamQueryBo" resultMap="QuestionChapterExamResultVo">
@@ -62,7 +65,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             qce.sort AS exam_sort,
             3 as type,
             uer.record_id,
-            uer.record_status
+            uer.record_status,
+            uer.total_question_num,
+            uer.right_question_num,
+            uer.do_question_num
         FROM
             question_chapter_exam qce
                 LEFT JOIN (
@@ -78,7 +84,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN (SELECT
                                record_id,
                                `status` as record_status,
-                               exam_id
+                               exam_id,
+                               total_question_num,
+                               right_question_num,
+                               do_question_num
                            FROM
                                user_exam_record
                            WHERE

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsAttachedMapper.xml

@@ -25,6 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="questionNum" column="question_num"/>
 		<result property="recordId" column="record_id"/>
 		<result property="recordStatus" column="record_status"/>
+		<result property="totalScore" column="total_score"/>
+		<result property="totalQuestionNum" column="total_question_num"/>
+		<result property="rightQuestionNum" column="right_question_num"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.goods.bo.GoodsAttachedQueryBo" resultMap="GoodsAttachedResultVo">
@@ -147,14 +150,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 					uer.record_id
 				END record_id,
 			CASE
-
 				WHEN ga.type = 1 THEN
 					0
 				WHEN ga.type = 2 THEN
 					0
 				WHEN ga.type = 3 THEN
 					uer.status
-				END record_status
+				END record_status,
+			uer.total_question_num,
+			uer.right_question_num,
+			uer.do_question_num
 		FROM
 			goods_attached ga
 				LEFT JOIN question_module qm ON ga.major_id = qm.module_exam_id
@@ -185,7 +190,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				LEFT JOIN (SELECT
 							   record_id,
 							   `status`,
-							   exam_id
+							   exam_id,
+							   total_question_num,
+							   right_question_num,
+							   do_question_num
 						   FROM
 							   user_exam_record
 						   WHERE

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (SELECT gs.goods_name FROM goods gs where 1=1 and g.make_goods_id = gs.goods_id) as make_goods_name,
         (SELECT gs.code FROM goods gs where 1=1 and g.make_goods_id = gs.goods_id) as make_goods_code
         <if test="goodsType ==1">
-        ,gs.subject_num
+        , IFNULL(gs.subject_num,0) as subject_num
         </if>
         FROM
         goods g
@@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN order_input_template ot ON cb.template_status = ot.id
         <if test="goodsType ==1">
         LEFT JOIN (SELECT
-            count( c.subject_id ) subject_num,
+            IFNULL(count(DISTINCT c.subject_id ),0) subject_num,
             gc.goods_id
             FROM
             goods g