fix 模考已结束页面

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/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