|
|
@@ -2414,6 +2414,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
Goods goods = iGoodsService.getById(goodsId);
|
|
|
String tenantId = ServletUtils.getRequest().getHeader("TenantId");
|
|
|
SysTenant sysTenant = iSysTenantService.getById(Long.valueOf(tenantId));
|
|
|
+ String sevenYear = goods.getSevenYear();
|
|
|
//指定班级
|
|
|
if (gradeId != null && gradeId > 0) {
|
|
|
ClassGradeVo classGradeVo = iClassGradeService.queryById(gradeId);
|
|
|
@@ -2431,7 +2432,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
|
|
|
int locakStudentNum = 0;
|
|
|
Boolean sevenFlag = false;
|
|
|
- if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员")){
|
|
|
+ if (businessFull.contains("继续教育") && businessFull.contains("施工现场专业人员") && !Arrays.asList("2024").contains(sevenYear)){
|
|
|
if (ObjectUtils.isNotNull(sysTenant.getSevenClass()) && sysTenant.getSevenClass() == 1){
|
|
|
//七大员继教班级共享
|
|
|
locakStudentNum = baseMapper.getStudeCountByCodeNoTenant(classGradeVo.getSevenCode());
|
|
|
@@ -2531,7 +2532,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
//七大员继教
|
|
|
// classGrade.setStudentUpper(ClassGrade.INIT_UPPER3); //上限1000
|
|
|
classGrade.setStudentUpper(2);
|
|
|
- String sevenYear = goods.getSevenYear();
|
|
|
if (!Arrays.asList("2024").contains(sevenYear)){
|
|
|
//班级绑定学员资料推送和学时推送
|
|
|
List<ClassGradeInterface> list = iClassGradeInterfaceService.list(new LambdaQueryWrapper<ClassGradeInterface>()
|
