fit 学习进度

zhongzheng-api/src/main/java/com/zhongzheng/controller/bank/QuestionController.java

@@ -75,7 +75,7 @@ public class QuestionController extends BaseController {
         List<GoodsUserQuestionVo> list = iQuestionService.listGoodsUserQuestionVo(bo);
         for (GoodsUserQuestionVo g : list) {
             UserExamRecordQueryBo userExamRecordQueryBo = new UserExamRecordQueryBo();
-            userExamRecordQueryBo.setGoodsId(g.getGoodsId());
+            userExamRecordQueryBo.setOrderGoodsId(g.getOrderGoodsId());
             userExamRecordQueryBo.setUserId(loginUser.getUser().getUserId());
             Long doNum = iUserExamRecordService.selectDoNum(userExamRecordQueryBo);
             Long totalNum = iGoodsService.getQuestionNum(g.getGoodsId());

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserQueryBo.java

@@ -226,6 +226,12 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 	@ApiModelProperty("学员身份证")
 	private String idCard;
 
+	/**
+	 * 学员身份证集合
+	 */
+	@ApiModelProperty("学员身份证集合")
+	private List<String> idCards;
+
 	/**
 	 * 订单编号
 	 */

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -353,7 +353,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         og.service_end_time,
         g.goods_name,
         og.order_sn,
-        m.category_name
+        m.category_name,
+        g.major_id,
+        u.province
         FROM
         class_grade_user cgu
         LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_id
@@ -391,6 +393,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="idCard != null and idCard != ''">
             AND u.id_card = #{idCard}
         </if>
+        <if test="idCards != null and idCards.size() ！= 0">
+            AND u.id_card IN
+            <foreach collection="idCards" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+            </foreach>
+        </if>
         <if test="orderSn != null and orderSn != ''">
             AND og.order_sn = #{orderSn}
         </if>
@@ -403,10 +411,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="searchEndTime != null and searchEndTime != ''">
             AND cgu.create_time &lt; #{searchEndTime}
         </if>
-        <if test="finishStatus != null and finishStatus != ''">
+        <if test="finishStatus != null">
             AND cgu.finish_status = #{finishStatus}
         </if>
-        <if test="learnStatus != null and learnStatus != ''">
+        <if test="learnStatus != null">
             AND cgu.learn_status = #{learnStatus}
         </if>
         <if test="businessId != null and businessId != ''">
@@ -415,6 +423,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="educationTypeId != null and educationTypeId != ''">
             AND g.education_type_id = #{educationTypeId}
         </if>
+        <if test="majorId != null and majorId != ''">
+            AND m.id = #{majorId}
+        </if>
         <if test="interfaceAccountId != null and interfaceAccountId != ''">
             AND cg.interface_account_id is not null
         </if>