fix random

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeQueryBo.java

@@ -137,4 +137,10 @@ public class ClassGradeQueryBo extends BaseEntity {
 
 	@ApiModelProperty("商品id数组")
 	private List<Long> goodsIds;
+	/** 开始时间 */
+	@ApiModelProperty("开始时间")
+	private Long startTime;
+	/** 结束时间 */
+	@ApiModelProperty("结束时间")
+	private Long endTime;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeMapper.java

@@ -60,4 +60,6 @@ public interface ClassGradeMapper extends BaseMapper<ClassGrade> {
 
     @InterceptorIgnore(tenantLine = "true")
     Integer queryOfficialGradeCount(ClassGradeQueryBo bo);
+
+    List<ClassGradeVo> queryGradeList(ClassGradeQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/IClassGradeService.java

@@ -87,4 +87,6 @@ public interface IClassGradeService extends IService<ClassGrade> {
 	Integer queryOfficialGradeCount(ClassGradeQueryBo bo);
 
 	boolean checkEjjjPeopleNumLimit(Long businessId,Long gradeId);
+
+	List<ClassGradeVo> queryGradeList(ClassGradeQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -752,6 +752,11 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         return true;
     }
 
+    @Override
+    public List<ClassGradeVo> queryGradeList(ClassGradeQueryBo bo) {
+        return baseMapper.queryGradeList(bo);
+    }
+
 
     /**
      * 实体类转化成视图对象

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/UserPeriodServiceImpl.java

@@ -631,7 +631,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             studyRec.setChapterList(ChapterList);
         }
         //七大员
-        if(Validator.isNotEmpty(business7.getId())&&goodsVo.getBusinessId().longValue()==business7.getId().longValue()){
+        if(Validator.isNotEmpty(business7)&&goodsVo.getBusinessId().longValue()==business7.getId().longValue()){
             for(CourseVo courseVo : courseVoList){
                 CourseMenuQueryBo menuQueryBo = new CourseMenuQueryBo();
                 menuQueryBo.setCourseId(courseVo.getCourseId());
@@ -722,7 +722,6 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             }
             studyRec.setChapterList(ChapterList);
         }
-        System.out.println(JSONObject.toJSONString(studyRec));
         //学习记录推送到旧系统
         Map<String, String> params = new HashMap<>();
         Long nowTime = DateUtils.getNowTime();

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -61,6 +61,7 @@ import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.BankGoodsExamVo;
 import com.zhongzheng.modules.goods.vo.GoodsCourseVo;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
+import com.zhongzheng.modules.grade.bo.ClassGradeQueryBo;
 import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
 import com.zhongzheng.modules.grade.domain.*;
 import com.zhongzheng.modules.grade.service.*;
@@ -2856,7 +2857,20 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
 
     @Override
     public void noFinishExamToStudentThree(UserQueryBo bo) {
+        //3天要结束
+        Calendar cal1 = new GregorianCalendar();
+        cal1.add(Calendar.DATE, -4);
+        Long startTime = cal1.getTimeInMillis() / 1000;
+        Calendar cal2 = new GregorianCalendar();
+        cal2.add(Calendar.DATE, -3);
+        Long endTime = cal2.getTimeInMillis() / 1000;
+        ClassGradeQueryBo queryBo = new ClassGradeQueryBo();
+        queryBo.setStartTime(startTime);
+        queryBo.setEndTime(endTime);
+        List<ClassGradeVo> gradeVoList = iClassGradeService.queryGradeList(queryBo);
+        for(ClassGradeVo gradeVo : gradeVoList){
 
+        }
     }
 
     @Override

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -868,4 +868,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
           AND cgu.`status` = 1
     </select>
+
+    <select id="queryGradeList" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeQueryBo" resultMap="ClassGradeVoResult">
+        SELECT
+            *
+        FROM
+             class_grade where
+            class_end_time > #{startTime}
+            AND #{endTime} >= class_end_time
+    </select>
 </mapper>