Merge remote-tracking branch 'origin/dev' into dev

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

@@ -17,9 +17,10 @@ public class ClassNpUserInfoVo implements Serializable {
 
     private Long userId;
 
+    private Integer finishStatus;
+
     private Long gradeId;
 
-    private Integer finishStatus;
 
     private String subjectIds;
 

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

@@ -763,7 +763,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
 
     @Override
     public List<ClassPeriodVo> menuAllListWithExam(UserStudyRecordQueryBo bo) {
-        if(Validator.isEmpty(bo.getCourseId())){
+        if(Validator.isEmpty(bo.getCourseId())||Validator.isEmpty(bo.getOrderGoodsId())){
             throw new CustomException("参数缺失");
         }
         //存储整个目录节列表
@@ -848,6 +848,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             section.setGradeId(bo.getGradeId());
             section.setUserId(bo.getUserId());
             section.setCourseId(bo.getCourseId());
+            section.setOrderGoodsId(bo.getOrderGoodsId());
             if(section.getType()<4){
                 section.setStudyStatus(baseMapper.getStudyStatus(section));
             }else{

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

@@ -200,6 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTimeLong" column="createTimeLong"/>
         <result property="doTimeLong" column="doTimeLong"/>
         <result property="reportStatu" column="reportStatu"/>
+        <result property="finishStatus" column="finishStatus"/>
         <result property="studyQueueStatus" column="studyQueueStatus"/>
         <result property="finishStatus" column="finishStatus"/>
         <result property="applyTimeLong" column="applyTimeLong"/>
@@ -948,6 +949,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cg.class_start_time as createTimeLong,
             cgu.official_status_time as doTimeLong,
             cgu.official_status as reportStatu,
+            cgu.finish_status as finishStatus,
             cgu.period_plush as studyQueueStatus,
             cgu.period_wait_time as applyTimeLong,
             cgu.finish_status as finishStatus,