Browse Source

fix 考试时间

he2802 3 năm trước cách đây
mục cha
commit
1a64c636d4

+ 2 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamApplyQueryBo.java

@@ -108,5 +108,6 @@ public class ExamApplyQueryBo extends BaseEntity {
 	@ApiModelProperty("考试地址Id")
 	private Long applySiteId;
 
-
+	@ApiModelProperty("考试日期")
+	private Long examTime;
 }

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

@@ -687,6 +687,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             queryTimeBo.setApplySiteId(applySiteId);
             queryTimeBo.setStartTime(startTime);
             queryTimeBo.setEndTime(endTime);
+            queryTimeBo.setExamTime(userSubscribeAddBo.getApplySiteExamTime());
             Long siteTime = examApplyMapper.checkSiteTimeHave(queryTimeBo);
             if (Validator.isEmpty(siteTime)) {
                 userSubscribeImport.setCause("该考试时间段不存在");
@@ -884,6 +885,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             queryTimeBo.setApplySiteId(applySiteId);
             queryTimeBo.setStartTime(startTime);
             queryTimeBo.setEndTime(endTime);
+            queryTimeBo.setExamTime(userSubscribeAddBo.getApplySiteExamTime());
             Long siteTime = examApplyMapper.checkSiteTimeHave(queryTimeBo);
             if (Validator.isEmpty(siteTime)) {
                 userSubscribeImport.setCause("该考试时间段不存在");
@@ -949,6 +951,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             queryTimeTrainBo.setApplySiteId(applySiteId);
             queryTimeTrainBo.setStartTime(startTrainTime);
             queryTimeTrainBo.setEndTime(endTrainTime);
+            queryTimeTrainBo.setExamTime(userSubscribeAddBo.getApplySiteExamTrainTime());
             Long siteTrainTime = examApplyMapper.checkSiteTimeHave(queryTimeTrainBo);
             if (Validator.isEmpty(siteTrainTime)) {
                 userSubscribeImport.setCause("该考培时间段不存在");

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

@@ -407,6 +407,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="checkSiteTimeHave" parameterType="com.zhongzheng.modules.exam.bo.ExamApplyQueryBo" resultType="long">
-        SELECT count(*) FROM exam_apply_site_time  where apply_site_id = #{applySiteId} and site_time like concat('%', #{startTime}, '%') and site_time like concat('%', #{endTime}, '%')
+        SELECT count(*) FROM exam_apply_site_time  where apply_site_id = #{applySiteId} and site_time like concat('%', #{startTime}, '%') and site_time like concat('%', #{endTime}, '%') and exam_time = #{examTime}
     </select>
 </mapper>