fix 模考列表sql修改

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/service/impl/MockApplyServiceImpl.java

@@ -228,8 +228,8 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
             mockApplyVo.setSubscribeNum(userMockSubscribeList1.size());
 
             LambdaQueryWrapper<UserMockSubscribe> lqw4 = new LambdaQueryWrapper<>();
-            lqw3.eq(UserMockSubscribe::getApplyId, mockApplyVo.getApplyId());
-            lqw3.eq(UserMockSubscribe::getSubscribeStatus, "0");
+            lqw4.eq(UserMockSubscribe::getApplyId, mockApplyVo.getApplyId());
+            lqw4.eq(UserMockSubscribe::getSubscribeStatus, "0");
             List<UserMockSubscribe> userMockSubscribeList2 = iUserMockSubscribeService.list(lqw4);
             mockApplyVo.setSubscribeCancelNum(userMockSubscribeList2.size());
         });

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

@@ -117,6 +117,11 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
                 throw new CustomException("已进行同类型模考，不能再预约了哦~");
             }
             //重复预约
+            //已预约模考还没开始
+            if (System.currentTimeMillis()/1000 < userMockSubscribe.getApplySiteExamTime()) {
+                throw new CustomException("已存在同类型模考预约，不能再预约了哦~");
+            }
+            //已预约模考还没结束，或已参加
             if (!(System.currentTimeMillis()/1000 > formatTime(userMockSubscribe.getApplySiteExamTime(), userMockSubscribe.getApplySiteEndTime()))
                     && userMockSubscribe.getHandStatus() == 0) {
                 throw new CustomException("已存在同类型模考预约，不能再预约了哦~");

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

@@ -62,15 +62,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
         mms.mock_major_subject_id = #{mockMajorSubjectId}
     </select>
-    <select id="listApply" resultType="com.zhongzheng.modules.mock.vo.MockApplyVo">
+    <select id="listApply" parameterType="com.zhongzheng.modules.mock.bo.MockApplyQueryBo" resultMap="MockApplyVoResult">
         SELECT 	ma.*,
                 cet.education_name,
-                cb.business_name,
-
+                cb.business_name
         FROM mock_apply ma
                  LEFT JOIN course_education_type cet ON ma.education_type_id = cet.id
                  LEFT JOIN course_business cb ON ma.business_id = cb.id
-                LEFT
     </select>
     <select id="queryApplyList" parameterType="com.zhongzheng.modules.mock.bo.MockApplyQueryBo" resultMap="MockApplyVoResult">
         SELECT	ma.business_id,