submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderMapper.java

@@ -50,5 +50,5 @@ public interface OrderMapper extends BaseMapper<Order> {
 
     Integer getStudeCountByCode(String sevenCode);
 
-    ClassGrade getClassNameByGoods(@Param("educationTypeId") Long educationTypeId,@Param("projectId") Long projectId,@Param("businessId") Long businessId,@Param("majorId") Long majorId);
+    List<ClassGrade> getClassNameByGoods(@Param("educationTypeId") Long educationTypeId,@Param("projectId") Long projectId,@Param("businessId") Long businessId,@Param("majorId") Long majorId);
 }

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

@@ -2419,9 +2419,26 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         //七大员继教同一个专业下同一个班级名称
         Boolean classFlag = true;
         if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")){
-            ClassGrade gradeName = baseMapper.getClassNameByGoods(goods.getEducationTypeId(),goods.getProjectId().longValue(),goods.getBusinessId(),goods.getMajorId());
-            if (ObjectUtils.isNotNull(gradeName)){
-                classGrade.setClassName(gradeName.getClassName());
+            List<ClassGrade> gradeName = baseMapper.getClassNameByGoods(goods.getEducationTypeId(),goods.getProjectId().longValue(),goods.getBusinessId(),goods.getMajorId());
+            if (CollectionUtils.isNotEmpty(gradeName)){
+                ClassGrade grade = gradeName.stream().filter(x -> ObjectUtils.isNotNull(x.getClassStatus()) && x.getClassStatus() == 1).findFirst().orElse(null);
+                if (ObjectUtils.isNotEmpty(grade)){
+                    //存在已开班的班级
+                    classGrade.setClassStatus(grade.getClassStatus());
+                    classGrade.setOfficialName(grade.getOfficialName());
+                    classGrade.setClassName(grade.getClassName());
+                    classGrade.setLearningStatus(grade.getLearningStatus());
+                    if (grade.getLearningStatus() == 3){
+                        classGrade.setLearningTimeStart(grade.getLearningTimeStart());
+                    }
+                    classGrade.setClassStartTime(grade.getClassStartTime());
+                    classGrade.setClassEndTime(grade.getClassEndTime());
+                    classGrade.setInterfacePeriodId(grade.getInterfacePeriodId());
+                    classGrade.setInterfacePushId(grade.getInterfacePushId());
+                }else {
+                    String name = gradeName.stream().findFirst().get().getClassName();
+                    classGrade.setClassName(name);
+                }
                 classFlag = false;
             }
         }

zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -513,6 +513,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                       AND cgu.change_grade = 0
                 ) + ( SELECT COUNT( DISTINCT cgut.user_id ) FROM class_grade_user_temp cgut WHERE cgut.grade_id = cg.grade_id AND cgut.`status` = 1 )
             ) <![CDATA[ < ]]>  cg.student_upper
-            LIMIT 1
     </select>
 </mapper>