Browse Source

fix 考试地点

he2802 3 years ago
parent
commit
7936ab4b71

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -218,7 +218,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             throw new IllegalArgumentException("当前选择的考试时间已过期,请重新预约,选择未过期考试时间");
         }
         ExamApplyQueryBo queryTimeBo = new ExamApplyQueryBo();
-        queryTimeBo.setApplySiteId(bo.getApplyId());
+        queryTimeBo.setApplyId(bo.getApplyId());
         queryTimeBo.setStartTime(bo.getApplySiteStartTime().replace("-", ":"));
         queryTimeBo.setEndTime(bo.getApplySiteEndTime().replace("-", ":"));
         queryTimeBo.setExamTime(time);

+ 10 - 1
zhongzheng-system/src/main/resources/mapper/modules/exam/ExamApplyMapper.xml

@@ -415,6 +415,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="siteTimeJson" parameterType="com.zhongzheng.modules.exam.bo.ExamApplyQueryBo" resultType="String">
-        SELECT site_time FROM exam_apply_site_time  where apply_site_id = #{applySiteId} and  exam_time = #{examTime}
+        SELECT
+            site_time
+        FROM
+            exam_apply_site_time e1
+                LEFT JOIN exam_apply_site ea ON e1.apply_site_id = ea.id
+                LEFT JOIN exam_site es ON ea.site_id = es.site_id
+        WHERE
+            e1.apply_id = #{applyId}
+          AND e1.exam_time = #{examTime}
+          AND es.site_address = #{applySiteAddress}
     </select>
 </mapper>