| 
														
															@@ -7,7 +7,6 @@ import java.util.List; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import java.util.Map; 
														 | 
														
														 | 
														
															 import java.util.Map; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import java.util.stream.Collectors; 
														 | 
														
														 | 
														
															 import java.util.stream.Collectors; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															-import org.apache.commons.beanutils.BeanUtils; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import org.apache.commons.collections.CollectionUtils; 
														 | 
														
														 | 
														
															 import org.apache.commons.collections.CollectionUtils; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import org.slf4j.Logger; 
														 | 
														
														 | 
														
															 import org.slf4j.Logger; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import org.slf4j.LoggerFactory; 
														 | 
														
														 | 
														
															 import org.slf4j.LoggerFactory; 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -15,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import org.springframework.stereotype.Service; 
														 | 
														
														 | 
														
															 import org.springframework.stereotype.Service; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import org.springframework.transaction.annotation.Transactional; 
														 | 
														
														 | 
														
															 import org.springframework.transaction.annotation.Transactional; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.baomidou.mybatisplus.core.metadata.IPage; 
														 | 
														
														 | 
														
															 import com.baomidou.mybatisplus.core.metadata.IPage; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.baomidou.mybatisplus.core.toolkit.StringUtils; 
														 | 
														
														 | 
														
															 import com.baomidou.mybatisplus.core.toolkit.StringUtils; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 
														 | 
														
														 | 
														
															 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -291,7 +291,7 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         VideoLessonGroupLog  videoLessonGroupLog = new VideoLessonGroupLog(); 
														 | 
														
														 | 
														
															         VideoLessonGroupLog  videoLessonGroupLog = new VideoLessonGroupLog(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															          
														 | 
														
														 | 
														
															          
														 | 
													
												
											
												
													
														| 
														 | 
														
															         try { 
														 | 
														
														 | 
														
															         try { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-			BeanUtils.copyProperties(videoLessonGroupLog, lessonGroup); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        	org.springframework.beans.BeanUtils.copyProperties(lessonGroup, videoLessonGroupLog); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		} catch (Exception e) { 
														 | 
														
														 | 
														
															 		} catch (Exception e) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 			throw new BizException("属性复制失败"); 
														 | 
														
														 | 
														
															 			throw new BizException("属性复制失败"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		} 
														 | 
														
														 | 
														
															 		} 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -375,9 +375,10 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         VideoLessonGroup lessonGroup = lessonVo.getLessonGroup(); 
														 | 
														
														 | 
														
															         VideoLessonGroup lessonGroup = lessonVo.getLessonGroup(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         List<VideoLessonGroupDetail> lessonList = lessonVo.getLessonList(); 
														 | 
														
														 | 
														
															         List<VideoLessonGroupDetail> lessonList = lessonVo.getLessonList(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         //判断是否有正在审核中 
														 | 
														
														 | 
														
															         //判断是否有正在审核中 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        List<VideoLessonAuthRecord> videoLessonAuthRecords = recordDao.selectList(Wrappers.<VideoLessonAuthRecord>lambdaQuery() 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                .eq(VideoLessonAuthRecord::getVideoGroupId, lessonGroup.getId()) 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                .eq(VideoLessonAuthRecord::getAuditStatus, AuthStatusEnum.DOING.getCode())); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        QueryWrapper<VideoLessonAuthRecord> wrapper = new QueryWrapper<VideoLessonAuthRecord>(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        wrapper.eq("video_group_id_", lessonGroup.getId()).eq("audit_status_", AuthStatusEnum.DOING.getCode()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+         
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        List<VideoLessonAuthRecord> videoLessonAuthRecords = recordDao.selectList(wrapper); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         if(CollectionUtils.isNotEmpty(videoLessonAuthRecords)){ 
														 | 
														
														 | 
														
															         if(CollectionUtils.isNotEmpty(videoLessonAuthRecords)){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         	throw new BizException("正在审核中,无法修改"); 
														 | 
														
														 | 
														
															         	throw new BizException("正在审核中,无法修改"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } 
														 | 
														
														 | 
														
															         } 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -404,7 +405,7 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         VideoLessonGroupLog  videoLessonGroupLog = new VideoLessonGroupLog(); 
														 | 
														
														 | 
														
															         VideoLessonGroupLog  videoLessonGroupLog = new VideoLessonGroupLog(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															          
														 | 
														
														 | 
														
															          
														 | 
													
												
											
												
													
														| 
														 | 
														
															         try { 
														 | 
														
														 | 
														
															         try { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-			BeanUtils.copyProperties(videoLessonGroupLog, lessonGroup); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        	org.springframework.beans.BeanUtils.copyProperties(lessonGroup, videoLessonGroupLog); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		} catch (Exception e) { 
														 | 
														
														 | 
														
															 		} catch (Exception e) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 			throw new BizException("属性复制失败"); 
														 | 
														
														 | 
														
															 			throw new BizException("属性复制失败"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		} 
														 | 
														
														 | 
														
															 		} 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -422,6 +423,15 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         lessonGroup.setAuditStatus(AuthStatusEnum.DOING); 
														 | 
														
														 | 
														
															         lessonGroup.setAuditStatus(AuthStatusEnum.DOING); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         lessonGroup.setUpdateTime(date); 
														 | 
														
														 | 
														
															         lessonGroup.setUpdateTime(date); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         videoLessonGroupDao.updateById(lessonGroup); 
														 | 
														
														 | 
														
															         videoLessonGroupDao.updateById(lessonGroup); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+         
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+		if (lessonList != null && lessonList.size() > 0) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+			for (VideoLessonGroupDetail detail : lessonList) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+				detail.setVideoLessonGroupId(lessonGroup.getId()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+				detail.setTeacherId(sysUser.getId()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+			} 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+			// 添加课程 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+			videoLessonGroupDetailDao.insertVideoLesson(lessonList); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+		} 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															         //刷新统计 
														 | 
														
														 | 
														
															         //刷新统计 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         VideoLessonGroupUpVo groupUpVo = new VideoLessonGroupUpVo(); 
														 | 
														
														 | 
														
															         VideoLessonGroupUpVo groupUpVo = new VideoLessonGroupUpVo(); 
														 |