he2802 3 年 前
コミット
175048d113

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -342,6 +342,10 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             classGradeUser1.setPeriodTime(DateUtils.getNowTime());
             //判断结业
             long nowTime = System.currentTimeMillis()/1000;
+            if(Validator.isEmpty(classPeriodStudentVo.getClassStartTime())){
+                //没设置永久有效
+                classGradeUser1.setFinishStatus(1);
+            }
             if(Validator.isNotEmpty(classPeriodStudentVo.getClassEndTime())&&Validator.isNotEmpty(classPeriodStudentVo.getClassStartTime())){
                 if(nowTime<classPeriodStudentVo.getClassEndTime()&&nowTime>classPeriodStudentVo.getClassStartTime()){
                     classGradeUser1.setFinishStatus(1);

+ 2 - 2
zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -519,12 +519,12 @@
         FROM
             class_grade_user cgu
                 LEFT JOIN class_grade cg on cgu.grade_id = cg.grade_id
-                LEFT JOIN class_grade_goods cgg on cg.grade_id = cgg.grade_id
+                LEFT JOIN class_grade_goods cgg on cg.grade_id = cgg.grade_id and cgg.goods_id = #{goodsId}
         WHERE
             cgu.user_id=#{userId}
 
           and cg.`status` =1
-          and cgg.goods_id = #{goodsId}
+
         and cgu.change_grade = 0
         order by cg.create_time desc LIMIT 1
     </select>