tanzh пре 3 година
родитељ
комит
b52cc9e64c

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

@@ -126,7 +126,7 @@ public class UserMockSubscribeController extends BaseController {
     @ApiOperation("查询用户个人预约模考列表")
     @PreAuthorize("@ss.hasPermi('system:subscribe:list')")
     @GetMapping("/listSubscribe")
-    public TableDataInfo<UserMockSubscribeVo> listSubscribe(@RequestBody UserMockSubscribeQueryBo bo) {
+    public TableDataInfo<UserMockSubscribeVo> listSubscribe(UserMockSubscribeQueryBo bo) {
         startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());

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

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