submit

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

@@ -2267,6 +2267,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         }*/
         OrderGoods orderGoods = iOrderGoodsService.getById(orderGoodsId);
         String businessFull = iGoodsService.getGoodsBusinessName(goodsId);
+        Goods goods = iGoodsService.getById(goodsId);
         //指定班级
         if (gradeId != null && gradeId > 0) {
             ClassGradeVo classGradeVo = iClassGradeService.queryById(gradeId);
@@ -2366,18 +2367,21 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if (businessFullName.contains("继续教育") && businessFullName.contains("施工现场专业人员")){
                 //七大员继教
                 classGrade.setStudentUpper(ClassGrade.INIT_UPPER3); //上限1000
-                //班级绑定学员资料推送和学时推送
-                List<ClassGradeInterface> list = iClassGradeInterfaceService.list(new LambdaQueryWrapper<ClassGradeInterface>()
-                        .eq(ClassGradeInterface::getStatus, 1)
-                        .in(ClassGradeInterface::getType, Arrays.asList(1, 3)));
-                if (CollectionUtils.isNotEmpty(list)){
-                    list.forEach(item -> {
-                        if (item.getType() == 1){
-                            classGrade.setInterfacePushId(item.getId());
-                        }else if(item.getType() == 3){
-                            classGrade.setInterfacePeriodId(item.getId());
-                        }
-                    });
+                String sevenYear = goods.getSevenYear();
+                if (!Arrays.asList("2021,2022").contains(sevenYear)){
+                    //班级绑定学员资料推送和学时推送
+                    List<ClassGradeInterface> list = iClassGradeInterfaceService.list(new LambdaQueryWrapper<ClassGradeInterface>()
+                            .eq(ClassGradeInterface::getStatus, 1)
+                            .in(ClassGradeInterface::getType, Arrays.asList(1, 3)));
+                    if (CollectionUtils.isNotEmpty(list)){
+                        list.forEach(item -> {
+                            if (item.getType() == 1){
+                                classGrade.setInterfacePushId(item.getId());
+                            }else if(item.getType() == 3){
+                                classGrade.setInterfacePeriodId(item.getId());
+                            }
+                        });
+                    }
                 }
                 String sevenCode = getSevenCode(goodsId);
                 classGrade.setSevenCode(sevenCode);
@@ -2410,7 +2414,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         //七大员继教同一个专业下同一个班级名称
         Boolean classFlag = true;
         if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")){
-            Goods goods = iGoodsService.getById(goodsId);
             ClassGrade gradeName = baseMapper.getClassNameByGoods(goods.getEducationTypeId(),goods.getProjectId().longValue(),goods.getBusinessId(),goods.getMajorId());
             if (ObjectUtils.isNotNull(gradeName)){
                 classGrade.setClassName(gradeName.getClassName());
@@ -2420,7 +2423,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         if (classFlag){
             //班级名称 年份+期数+业务层次（俗名）+教育类型+科目（存在多个科目时，显示多个科目，用“+”分割）
             String businessName = businessVo.getAliasName();
-            Goods goods = iGoodsService.getById(goodsId);
             CourseEducationType educationType = courseEducationTypeService.getById(goods.getEducationTypeId());
             String educationName = educationType.getEducationName();
             String className = businessName + educationName;