搜索条件新增

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamBeforeServiceImpl.java

@@ -45,11 +45,7 @@ public class ExamBeforeServiceImpl extends ServiceImpl<ExamBeforeMapper, ExamBef
             Calendar calendar = Calendar.getInstance();
             calendar.setTimeZone(TimeZone.getTimeZone("GMT+8:00"));
             calendar.setTimeInMillis(System.currentTimeMillis());
-            calendar.set(Calendar.HOUR_OF_DAY, 23);
-            calendar.set(Calendar.MINUTE, 59);
-            calendar.set(Calendar.SECOND, 59);
-            calendar.set(Calendar.MILLISECOND, 999);
-            if ((examBeforeVo.getBeforeEndTime()+86400)  < calendar.getTimeInMillis()/1000){
+            if ((examBeforeVo.getBeforeEndTime()+86400) < calendar.getTimeInMillis()/1000){
                 ExamBefore update = new ExamBefore();
                 update.setBeforeId(examBeforeVo.getBeforeId());
                 update.setStatus(2);

zhongzheng-system/src/main/resources/mapper/modules/base/UserProfileMapper.xml

@@ -80,16 +80,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND up.goods_id =#{goodsId}
         </if>
         <if test="educationTypeId != null and educationTypeId !='' ">
-            AND g.education_type_id =#{educationTypeId}
+            AND (SELECT cet.education_type_id FROM goods g LEFT JOIN course_education_type cet on g.education_type_id = cet.id where up.goods_id = g.goods_id) =#{educationTypeId}
         </if>
         <if test="businessId != null and businessId !='' ">
-            AND g.business_id =#{businessId}
+            AND (SELECT cet.business_id FROM goods g LEFT JOIN course_business cet on g.business_id = cet.id where up.goods_id = g.goods_id) =#{businessId}
         </if>
         <if test="schoolId != null and schoolId !='' ">
-            AND g.school_id =#{schoolId}
+            AND (SELECT g.school_id FROM goods g  where up.goods_id = g.goods_id)  =#{schoolId}
         </if>
         <if test="majorId != null and majorId !='' ">
-            AND g.major_id =#{majorId}
+            AND (SELECT g.major_id FROM goods g  where up.goods_id = g.goods_id) =#{majorId}
         </if>
         <if test="changeStatus != null and changeStatus !='' ">
             AND up.change_status =#{changeStatus}