Merge branch 'dev' into pre

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserMockSubscribeController.java

@@ -127,11 +127,10 @@ public class UserMockSubscribeController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:subscribe:list')")
     @GetMapping("/listSubscribe")
     public TableDataInfo<UserMockSubscribeVo> listSubscribe(UserMockSubscribeQueryBo bo) {
-        startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         List<UserMockSubscribeVo> list = iUserMockSubscribeService.listSubscribe(bo);
-        return getDataTable(list);
+        return getDataTable(getPageInfo(bo.getPageNum(), bo.getPageSize(), list).getList());
     }
 
     /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamApplyServiceImpl.java

@@ -121,7 +121,7 @@ public class ExamApplyServiceImpl extends ServiceImpl<ExamApplyMapper, ExamApply
                 throw new CustomException("请先设置考试地点和时间");
             }
             //考试计划内的商品是否被其他计划使用
-            List<Long> contGoods = baseMapper.countGoodsHold(bo.getApplyId());
+            /*List<Long> contGoods = baseMapper.countGoodsHold(bo.getApplyId());
             if (CollectionUtils.isNotEmpty(contGoods)){
                 String goodsName ="";
                 for (Long goodsId : contGoods) {
@@ -133,7 +133,7 @@ public class ExamApplyServiceImpl extends ServiceImpl<ExamApplyMapper, ExamApply
                     }
                 }
                 throw new RuntimeException(goodsName+"已被其他进行中的考试计划使用，请修改，再启用");
-            }
+            }*/
         }
         if(bo.getStatus()==-1){
             ExamApplyQueryBo queryBo = new ExamApplyQueryBo();

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

@@ -288,16 +288,18 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
                         if (System.currentTimeMillis()/1000 < formatTime(mockMajorSubjectTime.getExamTime(), mockMajorSubjectTime.getStartTime())) {
                             userMockSubscribeVo.setReSubscribe(1);
                         }
-                    } catch (ParseException e) {
-                        e.printStackTrace();
-                    }
-                    try {
                         if (System.currentTimeMillis()/1000 < formatTime(mockMajorSubjectTime.getExamTime(), mockMajorSubjectTime.getEndTime())) {
                             userMockSubscribeVo.setCanDo(0);
                         }
                     } catch (ParseException e) {
                         e.printStackTrace();
                     }
+                    LambdaQueryWrapper<UserMockRecord> lq = Wrappers.lambdaQuery();
+                    lq.eq(UserMockRecord::getUserId, bo.getUserId());
+                    lq.eq(UserMockRecord::getEachExamId, userMockSubscribe.getEachExamId());
+                    lq.last("limit 1");
+                    UserMockRecord userMockRecord = iUserMockRecordService.getOne(lq);
+                    userMockSubscribeVo.setRecordId(userMockRecord.getRecordId());
                     userMockSubscribeVos.add(userMockSubscribeVo);
                 });
                 mockMajorSubjectTimeList2.forEach(mockMajorSubjectTime -> {

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

@@ -76,6 +76,8 @@ public class SectionStudyRecordVo {
     private Long goodsId;
     @ApiModelProperty("商品名称")
     private String goodsName;
+    @ApiModelProperty("商品类型 1视频2题库 3补考 4前培 5虚拟赠送题库 6直播")
+    private Integer goodsType;
     @ApiModelProperty("班级ID")
     private Long gradeId;
     @ApiModelProperty("订单商品ID")

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

@@ -184,4 +184,9 @@ public class UserMockSubscribeVo {
 	@Excel(name = "重新预约 默认 否 1 是")
 	@ApiModelProperty("重新预约 默认 否 1 是")
 	private Integer reSubscribe;
+
+	/** 做题id */
+	@Excel(name = "做题id")
+	@ApiModelProperty("做题id")
+	private Long recordId;
 }

zhongzheng-system/src/main/resources/mapper/modules/mock/MockMajorSubjectTimeMapper.xml

@@ -73,7 +73,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cpt.project_name,
             ma.business_id,
             cb.business_name,
-            ma.time_limit
+            ma.time_limit,
+            mms.exam_id
         FROM
             mock_major_subject_time mmst
         LEFT JOIN mock_major_subject mms ON mmst.mock_major_subject_id = mms.mock_major_subject_id

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

@@ -77,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="coverUrl" column="cover_url"/>
         <result property="goodsId" column="goods_id"/>
         <result property="goodsName" column="goods_name"/>
+        <result property="goodsType" column="goods_type"/>
         <result property="courseId" column="course_id"/>
         <result property="moduleId" column="module_id"/>
         <result property="chapterId" column="chapter_id"/>
@@ -1275,6 +1276,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cs.section_type,
             r.*,
             g.goods_name,
+            g.goods_type,
             cgu.order_goods_id
         FROM
             (