submit

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

@@ -311,25 +311,21 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
             Long goodsId = bo.getClassGradeGoodsAddBos()[0];
             Goods goods = iGoodsService.getById(goodsId);
             String businessName = iGoodsService.getGoodsBusinessName(goodsId);
-            //2021 和 2022 年的课程不在祥粤学习
             if (businessName.contains("继续教育") && businessName.contains("施工现场专业人员")) {
-                String sevenYear = goods.getSevenYear();
-                if (!Arrays.asList("2021","2022").contains(sevenYear)){
-                    List<ClassGradeInterface> interfaceList = iClassGradeInterfaceService
-                            .list(new LambdaQueryWrapper<ClassGradeInterface>()
-                                    .in(ClassGradeInterface::getType, Arrays.asList(1, 3))
-                                    .eq(ClassGradeInterface::getStatus, 1));
-                    if (CollectionUtils.isNotEmpty(interfaceList)){
-                        interfaceList.forEach(item -> {
-                            if (item.getType() == 1){
-                                //官方信息推送
-                                add.setInterfacePushId(item.getId());
-                            }else if (item.getType() == 3){
-                                //学时推送
-                                add.setInterfacePeriodId(item.getId());
-                            }
-                        });
-                    }
+                List<ClassGradeInterface> interfaceList = iClassGradeInterfaceService
+                        .list(new LambdaQueryWrapper<ClassGradeInterface>()
+                                .in(ClassGradeInterface::getType, Arrays.asList(1, 3))
+                                .eq(ClassGradeInterface::getStatus, 1));
+                if (CollectionUtils.isNotEmpty(interfaceList)){
+                    interfaceList.forEach(item -> {
+                        if (item.getType() == 1){
+                            //官方信息推送
+                            add.setInterfacePushId(item.getId());
+                        }else if (item.getType() == 3){
+                            //学时推送
+                            add.setInterfacePeriodId(item.getId());
+                        }
+                    });
                 }
                 String sevenCode = getSevenCode(goodsId);
                 add.setSevenCode(sevenCode);
@@ -703,28 +699,14 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                 classGradeVo.setClassEndTime(update.getClassEndTime());
                 sendClassSMS(classGradeVo);
             }
-            if (fullName.contains("继续教育") && fullName.contains("施工现场专业人员") &&
-                    StringUtils.isNotBlank(goods.getSevenYear()) && Arrays.asList("2021","2022").contains(goods.getSevenYear())){
-                //七大员继教2021  2022年班级不开班
-                update.setClassStatus(0);
-                update.setInterfacePushId(null);
-                update.setInterfacePeriodId(null);
-            }
             this.updateById(update);
             if (fullName.contains("继续教育") && fullName.contains("施工现场专业人员") && StringUtils.isNotBlank(classGradeVo.getSevenCode())){
                 List<ClassGrade> list = baseMapper.getListNoTenant(classGradeVo.getSevenCode(),update.getGradeId());
                 if (CollectionUtils.isNotEmpty(list)){
-                    List<ClassGrade> collect = list.stream().filter(item -> {
-                        ClassGradeGoods classGradeGoods = iClassGradeGoodsService.getOneNoTenant(item.getGradeId());
-                        Goods goodsOne = iGoodsService.getGoodsByIdNotTenant(classGradeGoods.getGoodsId());
-                        return StringUtils.isNotBlank(goodsOne.getSevenYear()) && !Arrays.asList("2021", "2022").contains(goodsOne.getSevenYear());
-                    }).collect(Collectors.toList());
-                    if (CollectionUtils.isNotEmpty(collect)){
-                        list.forEach(item ->{
-                            update.setGradeId(item.getGradeId());
-                            updateByIdNoTenant(update);
-                        });
-                    }
+                    list.forEach(item ->{
+                        update.setGradeId(item.getGradeId());
+                        updateByIdNoTenant(update);
+                    });
                 }
             }
 

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

@@ -2478,8 +2478,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             ClassGradeVo classGradeVo = classGradeVoList.get(i);
             int locakStudentNum = 0;
             Boolean sevenFlag = false;
-            if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")
-                    && StringUtils.isNotBlank(goods.getSevenYear()) && !Arrays.asList("2021","2022").contains(goods.getSevenYear())){
+            if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")){
                 if (ObjectUtils.isNotNull(sysTenant.getSevenClass()) && sysTenant.getSevenClass() == 1){
                     //七大员继教班级共享
                     locakStudentNum = baseMapper.getStudeCountByCodeNoTenant(classGradeVo.getSevenCode());
@@ -2530,27 +2529,25 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if (businessFullName.contains("继续教育") && businessFullName.contains("施工现场专业人员")){
                 //七大员继教
                 classGrade.setStudentUpper(ClassGrade.INIT_UPPER3); //上限1000
-                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());
-                            }
-                        });
-                    }
-                    if (ObjectUtils.isNotNull(sysTenant.getSevenClass()) && sysTenant.getSevenClass() == 1){
-                        //七大员继教班级共享
-                        classGrade.setSevenCode(getSevenCodeNoTenant(goodsId));
-                    }else {
-                        classGrade.setSevenCode(getSevenCode(goodsId));
-                    }
+                //班级绑定学员资料推送和学时推送
+                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());
+                        }
+                    });
+                }
+                if (ObjectUtils.isNotNull(sysTenant.getSevenClass()) && sysTenant.getSevenClass() == 1){
+                    //七大员继教班级共享
+                    classGrade.setSevenCode(getSevenCodeNoTenant(goodsId));
+                }else {
+                    classGrade.setSevenCode(getSevenCode(goodsId));
                 }
             }else {
                 classGrade.setStudentUpper(ClassGrade.INIT_UPPER); //上限300
@@ -2581,8 +2578,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 //        classGrade.setClassName(goodsName + gradeCode);
         //七大员继教同一个专业下同一个班级名称
         Boolean classFlag = true;
-        if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")
-                && StringUtils.isNotBlank(goods.getSevenYear()) && !Arrays.asList("2021","2022").contains(goods.getSevenYear())){
+        if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")){
             List<ClassGrade> gradeName = new ArrayList<>();
             if (ObjectUtils.isNotNull(sysTenant.getSevenClass()) && sysTenant.getSevenClass() == 1){
                 //七大员继教班级共享