Merge branch 'dev' into pre

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -46,6 +46,7 @@ import com.zhongzheng.modules.inform.service.IInformRemindService;
 import com.zhongzheng.modules.inform.service.IInformUserService;
 import com.zhongzheng.modules.inform.vo.InformRemindBusinessVo;
 import com.zhongzheng.modules.inform.vo.InformRemindVo;
+import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 import com.zhongzheng.modules.polyv.bo.PolyvLiveQueryBo;
 import com.zhongzheng.modules.polyv.service.IPolyvLiveService;
 import com.zhongzheng.modules.user.bo.*;
@@ -748,18 +749,24 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         queryBo.setUserId(bo.getUserId());
         UserBankRecord bankVo = iUserBankRecordService.getUserLastExam(queryBo);
         if(Validator.isEmpty(vo)&&Validator.isNotEmpty(bankVo)){
-            vo = new SectionStudyRecordVo();
-            vo.setOrderGoodsId(bankVo.getOrderGoodsId());
+            vo = mergeToData(bankVo);
         }
         if(Validator.isNotEmpty(vo)&&Validator.isNotEmpty(bankVo)){
             if(vo.getUpdateTime().longValue()<bankVo.getUpdateTime().longValue()){
-                vo = new SectionStudyRecordVo();
-                vo.setOrderGoodsId(bankVo.getOrderGoodsId());
+                vo = mergeToData(bankVo);
+
             }
         }
         return vo;
     }
 
+    private SectionStudyRecordVo mergeToData(UserBankRecord bankVo){
+        SectionStudyRecordVo vo = BeanUtil.toBean(bankVo, SectionStudyRecordVo.class);
+        vo.setLearning((long)bankVo.getReportStatus());
+        vo.setExamType(bankVo.getType());
+        return vo;
+    }
+
 
     //判断当前未看完的节是否是点击播放的节
     private boolean compareSection(UserStudyRecordVo recordVo,UserStudyRecordQueryBo entity){

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

@@ -125,4 +125,7 @@ public class SectionStudyRecordVo {
     private Long learning;
     @ApiModelProperty("更新时间")
     private Long updateTime;
+    private Long examId;
+    /** 题卷类型 1章卷 2节卷 3模块卷 */
+    private Integer examType;
 }

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

@@ -188,7 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             user_bank_record ubr
         WHERE
             ubr.user_id = #{userId}
-
+            AND current_status = 1
         ORDER BY
             ubr.update_time DESC
         LIMIT 1

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

@@ -155,7 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         FROM
         `user` u
-       
+
         <if test="getOrderNum != null and getOrderNum == 1" >
             LEFT JOIN (
             SELECT