fix 题库

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/ExamStudyRecordVo.java

@@ -100,6 +100,6 @@ public class ExamStudyRecordVo {
     @Excel(name = "服务有效期结束")
     @ApiModelProperty("服务有效期结束")
     private Long serviceEndTime;
-
+    private Long orderGoodsId;
 
 }

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

@@ -421,7 +421,7 @@
         ORDER BY og.create_time DESC
     </select>
 
-    <select id="listBankGoodsList" parameterType="com.zhongzheng.modules.bank.bo.QuestionQueryBo" resultMap="GoodsUserQuestionVo">
+    <select id="listBankGoodsList" parameterType="com.zhongzheng.modules.goods.bo.GoodsQueryBo" resultMap="GoodsUserQuestionVo">
         SELECT
         g.*,
         ps.supply_name,
@@ -457,7 +457,9 @@
         LEFT JOIN `user` u ON u.user_id = o.user_id
         WHERE
         1 = 1
-        AND g.goods_type = 5
+        <if test="goodsType != null and goodsType != ''">
+        AND g.goods_type = #{goodsType}
+        </if>
         AND og.pay_status IN ( 2, 3, 4 )
         AND og.refund_status IN (0,3,1)
         <if test="goodsId != null and goodsId != ''">

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -100,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stuAllNum" column="stu_all_num"/>
         <result property="serviceStartTime" column="service_start_time"/>
         <result property="serviceEndTime" column="service_end_time"/>
+        <result property="orderGoodsId" column="order_goods_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.ExamSonStudyRecordVo" id="ExamSonStudyRecordVoResult">
@@ -422,6 +423,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         g.study_end_time,
         s.service_start_time,
         s.service_end_time,
+        s.order_goods_id,
         ( SELECT i.business_name FROM course_business i WHERE i.id = g.business_id ) AS business_name,
         ( SELECT p.project_name FROM course_project_type p WHERE p.id = g.project_id ) AS project_name,
         ( SELECT s.school_name FROM school s WHERE s.id = g.school_id ) AS school_name,
@@ -434,7 +436,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         s.service_end_time
         FROM
         goods g
-        LEFT JOIN order_goods s ON g.goods_id = s.goods_id AND s.pay_status in (2,3)
+        LEFT JOIN order_goods s ON g.goods_id = s.goods_id AND s.pay_status in (2,3,4)
         LEFT JOIN `order` o ON o.order_sn = s.order_sn
         WHERE
         g.goods_type =2