MRGE

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

@@ -273,6 +273,19 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
 //                throw new CustomException("二建/二造不允许直接创建开班班级！");
 //            }
 //        }
+        //班级绑定学员资料推送和学时推送
+        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){
+                    add.setInterfacePushId(item.getId());
+                }else if(item.getType() == 3){
+                    add.setInterfacePeriodId(item.getId());
+                }
+            });
+        }
 
         //是否创建官方班级编号
         if (bo.getClassGradeGoodsAddBos() != null &&

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

@@ -909,6 +909,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         if (!DateUtils.dateTimeNow(DateUtils.YYYYMMDD).equals(datetimeStr)) {
             throw new CustomException("数据错误");
         }
+        log.info("学时抽查"+ idCard+"RR"+datetime+"RR"+year);
         User user = iUserService.getOne(new LambdaQueryWrapper<User>().eq(User::getIdCard, EncryptHandler.encrypt(idCard)).last("limit 1"));
         if (Validator.isEmpty(user)) {
             throw new CustomException("身份证查无用户");

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

@@ -50,14 +50,8 @@ import com.zhongzheng.modules.grade.bo.ClassGradeListBo;
 import com.zhongzheng.modules.grade.bo.ClassGradeQueryBo;
 import com.zhongzheng.modules.grade.bo.ClassGradeSortBo;
 import com.zhongzheng.modules.grade.bo.ClassGradeUserTempQueryBo;
-import com.zhongzheng.modules.grade.domain.ClassGrade;
-import com.zhongzheng.modules.grade.domain.ClassGradeGoods;
-import com.zhongzheng.modules.grade.domain.ClassGradeUser;
-import com.zhongzheng.modules.grade.domain.ClassGradeUserTemp;
-import com.zhongzheng.modules.grade.service.IClassGradeGoodsService;
-import com.zhongzheng.modules.grade.service.IClassGradeService;
-import com.zhongzheng.modules.grade.service.IClassGradeUserService;
-import com.zhongzheng.modules.grade.service.IClassGradeUserTempService;
+import com.zhongzheng.modules.grade.domain.*;
+import com.zhongzheng.modules.grade.service.*;
 import com.zhongzheng.modules.grade.vo.ClassGradeUserTempVo;
 import com.zhongzheng.modules.grade.vo.ClassGradeVo;
 import com.zhongzheng.modules.order.bo.*;
@@ -129,6 +123,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Autowired
     private IClassGradeUserService iClassGradeUserService;
     @Autowired
+    private IClassGradeInterfaceService iClassGradeInterfaceService;
+    @Autowired
     private IClassGradeGoodsService iClassGradeGoodsService;
     @Autowired
     private IOrderBillSheetService iOrderBillSheetService;
@@ -2341,6 +2337,19 @@ 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());
+                        }
+                    });
+                }
             }else {
                 classGrade.setStudentUpper(ClassGrade.INIT_UPPER); //上限300
             }

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -2341,6 +2341,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 UserStudyRecord entity = BeanUtil.toBean(periodVo, UserStudyRecord.class);
                 entity.setGradeId(gradeUserGoodsVo.getGradeId());
                 entity.setUserId(gradeUserGoodsVo.getUserId());
+                entity.setOrderGoodsId(gradeUserGoodsVo.getOrderGoodsId());
                 Long periodId = null;
                 // 学习无记录加一条学时审核记录
                 if (userStudyRecordMapper.selectStudyRecord(entity) < 1) {
@@ -2355,6 +2356,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     userPeriod.setModuleId(entity.getModuleId());
                     userPeriod.setChapterId(entity.getChapterId());
                     userPeriod.setGradeId(entity.getGradeId());
+                    userPeriod.setOrderGoodsId(entity.getOrderGoodsId());
                     iUserPeriodService.save(userPeriod);
                     periodId = userPeriod.getId();
                     UserPeriodStatus userPeriodStatusAddBo = new UserPeriodStatus();