fix 个人模考预约状态

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserMockSubscribeQueryBo.java

@@ -121,4 +121,8 @@ public class UserMockSubscribeQueryBo extends BaseEntity {
 	/** 题号ID */
 	@ApiModelProperty("题号ID")
 	private String recordIds;
+
+	/** 考试状态 0未考试 1已结束 */
+	@ApiModelProperty("考试状态 0未考试 1已结束")
+	private Integer mockStatus;
 }

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

@@ -233,7 +233,34 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
     }
 
     @Override
-    public List<UserMockSubscribeVo> listSubscribe(UserMockSubscribeQueryBo bo) {
-        return baseMapper.listSubscribe(bo);
+    public List<UserMockSubscribeVo> listSubscribe(UserMockSubscribeQueryBo bo){
+        List<UserMockSubscribeVo> userMockSubscribeVoList = baseMapper.listSubscribe(bo);
+        List<UserMockSubscribeVo> userMockSubscribeVos = new ArrayList<>();
+        if (userMockSubscribeVoList != null && userMockSubscribeVoList.size() > 0) {
+            if (bo.getMockStatus() == 1) {
+                userMockSubscribeVoList.stream().forEach(userMockSubscribeVo -> {
+                    try {
+                        if (System.currentTimeMillis()/1000 < formatTime(userMockSubscribeVo.getApplySiteExamTime(), userMockSubscribeVo.getApplySiteStartTime())) {
+                            userMockSubscribeVos.add(userMockSubscribeVo);
+                        }
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                    }
+                });
+            }
+            if (bo.getMockStatus() == 2) {
+                userMockSubscribeVoList.stream().forEach(userMockSubscribeVo -> {
+                    try {
+                        if (System.currentTimeMillis()/1000 > formatTime(userMockSubscribeVo.getApplySiteExamTime(), userMockSubscribeVo.getApplySiteEndTime())) {
+                            userMockSubscribeVos.add(userMockSubscribeVo);
+                        }
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                    }
+                });
+            }
+
+        }
+        return userMockSubscribeVos;
     }
 }