submit

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

@@ -313,7 +313,6 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
             String businessName = iGoodsService.getGoodsBusinessName(goodsId);
             if (businessName.contains("继续教育") && businessName.contains("施工现场专业人员")) {
                 String sevenYear = goods.getSevenYear();
-                if (!Arrays.asList("2024").contains(sevenYear)){
                     List<ClassGradeInterface> interfaceList = iClassGradeInterfaceService
                             .list(new LambdaQueryWrapper<ClassGradeInterface>()
                                     .in(ClassGradeInterface::getType, Arrays.asList(1, 3))
@@ -331,7 +330,6 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                     }
                     String sevenCode = getSevenCode(goodsId,add.getStudentUpper());
                     add.setSevenCode(sevenCode);
-                }
             }
             else if (("继续教育二级建造师".equals(businessName)|| ("继续教育二级造价师".equals(businessName))) && sysTenant.getShareClass() == 1){
                 erJfalg = true;

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

@@ -2432,7 +2432,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
             int locakStudentNum = 0;
             Boolean sevenFlag = false;
-            if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员") && !Arrays.asList("2024").contains(sevenYear)){
+            if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")){
                 if (ObjectUtils.isNotNull(sysTenant.getSevenClass()) && sysTenant.getSevenClass() == 1){
                     //七大员继教班级共享
                     locakStudentNum = baseMapper.getStudeCountByCodeNoTenant(classGradeVo.getSevenCode());
@@ -2480,7 +2480,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             int locakStudentNum = 0;
             Boolean sevenFlag = false;
             if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")
-                    && StringUtils.isNotBlank(goods.getSevenYear()) && !Arrays.asList("2024").contains(goods.getSevenYear())){
+                    && StringUtils.isNotBlank(goods.getSevenYear())){
                 if (ObjectUtils.isNotNull(sysTenant.getSevenClass()) && sysTenant.getSevenClass() == 1){
                     //七大员继教班级共享
                     locakStudentNum = baseMapper.getStudeCountByCodeNoTenant(classGradeVo.getSevenCode());
@@ -2531,7 +2531,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if (businessFullName.contains("继续教育") && businessFullName.contains("施工现场专业人员")){
                 //七大员继教
                 classGrade.setStudentUpper(ClassGrade.INIT_UPPER3); //上限1000
-                if (!Arrays.asList("2024").contains(sevenYear)){
                     //班级绑定学员资料推送和学时推送
                     List<ClassGradeInterface> list = iClassGradeInterfaceService.list(new LambdaQueryWrapper<ClassGradeInterface>()
                             .eq(ClassGradeInterface::getStatus, 1)
@@ -2551,7 +2550,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                     }else {
                         classGrade.setSevenCode(getSevenCode(goodsId));
                     }
-                }
             }else {
                 classGrade.setStudentUpper(ClassGrade.INIT_UPPER); //上限300
             }
@@ -2582,7 +2580,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         //七大员继教同一个专业下同一个班级名称
         Boolean classFlag = true;
         if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")
-                && StringUtils.isNotBlank(goods.getSevenYear()) && !Arrays.asList("2024").contains(goods.getSevenYear())){
+                && StringUtils.isNotBlank(goods.getSevenYear())){
             List<ClassGrade> gradeName = new ArrayList<>();
             if (ObjectUtils.isNotNull(sysTenant.getSevenClass()) && sysTenant.getSevenClass() == 1){
                 //七大员继教班级共享