submit

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

@@ -240,6 +240,17 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         classGradeGoodsVos.forEach(item -> {
             if (CollectionUtils.isNotEmpty(item.getGradeList())) {
                 List<ClassGradeVo> collect = item.getGradeList().stream().filter(gradeVo -> {
+                    if (ObjectUtils.isNotNull(gradeVo.getClassStatus()) && gradeVo.getClassStatus() == 1){
+                        Long classStartTime = gradeVo.getClassStartTime();
+                        Integer pastDueDay = 10;
+                        if (ObjectUtils.isNotNull(gradeVo.getPastDueDay())){
+                            pastDueDay = gradeVo.getPastDueDay();
+                        }
+                        Long past = pastDueDay * 86400L + DateUtils.getNowTime();
+                        if (past > classStartTime){
+                            return false;
+                        }
+                    }
                     //班级人数是否满人
                     if (ObjectUtil.isNotNull(gradeVo.getSevenCode())) {
                         Long count = baseMapper.getGradeCount(gradeVo.getSevenCode());
@@ -274,7 +285,8 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                         }
                     }
                     return true;
-                }).sorted(Comparator.comparing(ClassGradeVo::getCreateTime).reversed()).collect(Collectors.toList());
+                }).sorted(Comparator.comparing(ClassGradeVo::getClassStatus).reversed()
+                        .thenComparing(ClassGradeVo::getCreateTime).reversed()).collect(Collectors.toList());
                 item.setGradeList(collect);
             }
         });
@@ -1960,7 +1972,18 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         if (CollectionUtils.isEmpty(businessVos)){
             return new ArrayList<>();
         }
-        businessVos.forEach(item -> {
+        List<ClassBusinessVo> result = new ArrayList<>();
+        for (ClassBusinessVo businessVo : businessVos) {
+            if (StringUtils.isBlank(businessVo.getSevenCode()) && CollectionUtils.isNotEmpty(result) &&
+                    result.stream().anyMatch(x -> x.getSevenCode().equals(businessVo.getSevenCode()))){
+                continue;
+            }
+            result.add(businessVo);
+        }
+        if (CollectionUtils.isEmpty(result)){
+            return new ArrayList<>();
+        }
+        result.forEach(item -> {
             if (item.getEduName().contains("继续教育") && (
                     item.getBusinessName().contains("二级建造师") || item.getBusinessName().contains("二级造价师") || item.getBusinessName().contains("施工现场专业人员")
                     )) {
@@ -1971,7 +1994,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                 item.setStudentNum(num.intValue());
             }
         });
-        return businessVos;
+        return result;
     }
 
     //创建预开班班级

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassBusinessVo.java

@@ -30,4 +30,6 @@ public class ClassBusinessVo implements Serializable {
     private String eduName;
 
     private String businessName;
+
+    private String sevenCode;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -2874,8 +2874,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                     }
                     classGrade.setClassStartTime(grade.getClassStartTime());
                     classGrade.setClassEndTime(grade.getClassEndTime());
-                    classGrade.setInterfacePeriodId(grade.getInterfacePeriodId());
-                    classGrade.setInterfacePushId(grade.getInterfacePushId());
+//                    classGrade.setInterfacePeriodId(grade.getInterfacePeriodId());
+//                    classGrade.setInterfacePushId(grade.getInterfacePushId());
                 }else {
 //                    String name = gradeName.stream().findFirst().get().getClassName();
                     String name = goods.getGoodsName()+"预开班";

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

@@ -1716,6 +1716,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                  cg.student_upper,
                                  cg.past_due_day,
                                  cg.create_time,
+                                 cg.seven_code,
                                  cet.education_name                         AS eduName,
                                  CONCAT(cb.business_name, cpt.project_name) AS businessName
                  FROM class_grade cg