fix 学习拍照

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

@@ -299,8 +299,10 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
                     lqw.orderByDesc(MockMajorSubjectTime::getId).last("limit 1");
                     MockMajorSubjectTime mockMajorSubjectTime = iMockMajorSubjectTimeService.getOne(lqw);
                     try {
-                        if (System.currentTimeMillis()/1000 < formatTime(mockMajorSubjectTime.getExamTime(), mockMajorSubjectTime.getStartTime())) {
-                            userMockSubscribeVo.setReSubscribe(1);
+                        if (Validator.isEmpty(userMockSubscribeVo.getHandStatus()) || userMockSubscribeVo.getHandStatus() == 0) {
+                            if (System.currentTimeMillis()/1000 < formatTime(mockMajorSubjectTime.getExamTime(), mockMajorSubjectTime.getStartTime())) {
+                                userMockSubscribeVo.setReSubscribe(1);
+                            }
                         }
                         if (System.currentTimeMillis()/1000 < formatTime(mockMajorSubjectTime.getExamTime(), mockMajorSubjectTime.getEndTime())) {
                             userMockSubscribeVo.setCanDo(0);
@@ -375,6 +377,19 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
 
     @Override
     public UserMockSubscribeVo listSubscribeInfo(Long subscribeId) {
-        return baseMapper.listSubscribeInfo(subscribeId);
+        UserMockSubscribeVo userMockSubscribeVo = baseMapper.listSubscribeInfo(subscribeId);
+        LambdaQueryWrapper<MockMajorSubjectTime> lqw = Wrappers.lambdaQuery();
+        lqw.eq(MockMajorSubjectTime::getMockMajorSubjectId, userMockSubscribeVo.getMockMajorSubjectId());
+        lqw.orderByDesc(MockMajorSubjectTime::getExamTime).last("limit 1");
+        MockMajorSubjectTime mockMajorSubjectTime = iMockMajorSubjectTimeService.getOne(lqw);
+        try {
+            if (System.currentTimeMillis()/1000 < formatTime(mockMajorSubjectTime.getExamTime(), mockMajorSubjectTime.getEndTime())) {
+                userMockSubscribeVo.setCanDo(0);
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        return userMockSubscribeVo;
     }
 }

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

@@ -66,9 +66,9 @@ public class UserMockSubscribeVo {
 	@Excel(name = "成绩")
 	@ApiModelProperty("成绩")
 	private Long performance;
-	/** 交卷状态 0为交卷 1手动交卷 2自动交卷 */
-	@Excel(name = "交卷状态 0为交卷 1手动交卷 2自动交卷")
-	@ApiModelProperty("交卷状态 0为交卷 1手动交卷 2自动交卷")
+	/** 交卷状态 0未交卷 1手动交卷 2自动交卷 */
+	@Excel(name = "交卷状态 0未交卷 1手动交卷 2自动交卷")
+	@ApiModelProperty("交卷状态 0未交卷 1手动交卷 2自动交卷")
 	private Integer handStatus;
 	/** 1通过 0不通过 */
 	@Excel(name = "1通过 0不通过")