Merge branch 'pre'

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/bank/service/impl/QuestionServiceImpl.java

@@ -395,9 +395,10 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                 //遍历正文
                 while (i<paragraphList.size())
                 {
+
                     content = paragraphList.get(i).getText();
                     System.out.println(content);
-                    System.out.println("AQW");
+                    System.out.println("AQW"+paragraphList.get(i).getPictureText());
                    if(Validator.isNotEmpty(content)){
                        content =dealTxt(content);
                        if(content.startsWith("注意事项")){

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodStudentVo.java

@@ -49,7 +49,7 @@ public class ClassPeriodStudentVo {
 	/** 学员编码 */
 	@Excel(name = "学员姓名")
 	@ApiModelProperty("学员姓名")
-	private String realName;
+	private String realname;
 
 
 	/** 学员编码 */

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

@@ -257,21 +257,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 									   user_exam_record
 								   WHERE
 									   user_id = #{userId}
-									 AND goods_id = #{goodsId}
+									 AND order_goods_id = #{orderGoodsId}
 								   GROUP BY
 									   exam_id)) uer on uer.exam_id = e.exam_id
 		WHERE
 			ga.goods_id = #{goodsId}
 		  AND ((
 					   ga.type = 3
-					   AND ga.major_id IN ( SELECT exam_id FROM user_exam_record WHERE user_id = #{userId} AND goods_id = #{goodsId} AND module_exam_id = 0 AND chapter_exam_id = 0 GROUP BY exam_id )
+					   AND ga.major_id IN ( SELECT exam_id FROM user_exam_record WHERE user_id = #{userId} AND order_goods_id = #{orderGoodsId} AND module_exam_id = 0 AND chapter_exam_id = 0 GROUP BY exam_id )
 					   AND e.STATUS = 1
 				   )
 			OR (
 					   ga.type = 2
-					   AND ga.major_id IN ( SELECT chapter_exam_id FROM user_exam_record WHERE user_id = #{userId} AND goods_id = #{goodsId} AND module_exam_id = 0 AND chapter_exam_id > 0 GROUP BY chapter_exam_id ))
+					   AND ga.major_id IN ( SELECT chapter_exam_id FROM user_exam_record WHERE user_id = #{userId} AND order_goods_id = #{orderGoodsId} AND module_exam_id = 0 AND chapter_exam_id > 0 GROUP BY chapter_exam_id ))
 			OR (
 					   ga.type = 1
-					   AND ga.major_id IN ( SELECT module_exam_id FROM user_exam_record WHERE user_id = #{userId} AND goods_id = #{goodsId} AND module_exam_id > 0 GROUP BY module_exam_id )))
+					   AND ga.major_id IN ( SELECT module_exam_id FROM user_exam_record WHERE user_id = #{userId} AND order_goods_id = #{orderGoodsId} AND module_exam_id > 0 GROUP BY module_exam_id )))
 	</select>
 </mapper>

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

@@ -128,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id" column="id"/>
         <result property="gradeId" column="grade_id"/>
         <result property="studentCode" column="user_account"/>
-        <result property="realName" column="realname"/>
+        <result property="realname" column="realname"/>
         <result property="idCard" column="id_card"/>
         <result property="telPhone" column="telphone"/>
         <result property="userStatus" column="user_status"/>