修改BUG

src/main/java/org/rcisoft/business/bcarousel/controller/BCarouselController.java

@@ -44,8 +44,7 @@ public class BCarouselController extends PaginationController<BCarousel> {
             @ApiImplicitParam(name = "isNewWindow", value = "是否跳转窗口", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "linkUrl", value = "链接", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "imageType", value = "图片类型", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "imageId", value = "图片id", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
+            @ApiImplicitParam(name = "imageId", value = "图片id", required = false, dataType = "varchar")})
     @PreAuthorize("hasRole('ROLE_1001')")
     @PostMapping(value = "/add")
     public Result add(BCarousel bCarousel) {
@@ -78,16 +77,10 @@ public class BCarouselController extends PaginationController<BCarousel> {
 
     @ApiOperation(value="获取图片分页", notes="根据URL中的参数分页查询图片")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "carouselDes", value = "轮播描述", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "carouselUrl", value = "轮播图片", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "carouselSort", value = "排序", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "isOpen", value = "是否显示 0未显示，1显示", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "isNewWindow", value = "是否跳转窗口", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "linkUrl", value = "链接", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "imageType", value = "图片类型", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "imageId", value = "图片id", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "delFlag", value = "删除标记（0：正常；1：删除；2：审核）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "flag", value = "启用标记（0：停用；1：启用）", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
     @GetMapping(value = "/queryBCarouselsByPaginationWithoutAuth")
     public GridModel queryBCarouselsByPagination(BCarousel param) {
@@ -98,15 +91,10 @@ public class BCarouselController extends PaginationController<BCarousel> {
 
     @ApiOperation(value="获取图片", notes="根据URL中的参数分页查询全部图片")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "carouselDes", value = "轮播描述", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "carouselUrl", value = "轮播图片", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "carouselSort", value = "排序", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "isOpen", value = "是否显示 0未显示，1显示", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "isNewWindow", value = "是否跳转窗口", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "linkUrl", value = "链接", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "imageType", value = "图片类型", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "imageId", value = "图片id", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
+            @ApiImplicitParam(name = "imageId", value = "图片id", required = false, dataType = "varchar")})
     @GetMapping(value = "/queryBCarousels")
     public Result queryBCarousels(BCarousel param) {
         param.setCreateBy(UserUtil.getUserInfoProp(getToken(),UserUtil.USER_ID));

src/main/java/org/rcisoft/business/bchapter/controller/BChapterController.java

@@ -66,16 +66,12 @@ public class BChapterController extends PaginationController<BChapter> {
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "slId", value = "开课id", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "chapterName", value = "章节名称", required = true, dataType = "varchar"),
-            @ApiImplicitParam(name = "chapterLevel", value = "等级，1：章 2：节", required = false, dataType = "Byte"),
             @ApiImplicitParam(name = "pid", value = "上一级", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "chapterUrl", value = "课程url", required = true, dataType = "varchar"),
-            @ApiImplicitParam(name = "mdFile", value = "任务书", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "classHour", value = "课时", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "classHour", value = "课时", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "isTest", value = "1:实验  2:视频   3:PPT'", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "lessonOrSl", value = "课程或开课;0：开课  1：课程", required = true, dataType = "varchar"),
             @ApiImplicitParam(name = "lessonId", value = "课程ID(课程ID和开课ID只能存在一个)", required = false, dataType = "varchar")})
-    @PreAuthorize("hasRole('ROLE_1001')")
+    @PreAuthorize("hasAnyRole('ROLE_1002','ROLE_1002')")
     @PostMapping(value = "/add")
     public Result add(@Valid BChapter bChapter,
                       BindingResult bindingResult
@@ -144,14 +140,7 @@ public class BChapterController extends PaginationController<BChapter> {
 
     @ApiOperation(value="分页查询章节", notes="根据条件分页查询章节")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "slId", value = "开课id", required = true, dataType = "varchar"),
-            @ApiImplicitParam(name = "chapterName", value = "章节名称", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "chapterLevel", value = "等级，1：章 2：节", required = false, dataType = "Byte"),
-            @ApiImplicitParam(name = "pid", value = "上一级", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "chapterUrl", value = "课程url", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "mdFile", value = "任务书", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "isTest", value = "1:实验  2:视频   3:PPT'", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar"),
+            @ApiImplicitParam(name = "slId", value = "开课id", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "lessonOrSl", value = "课程或开课;0：开课  1：课程", required = true, dataType = "varchar"),
             @ApiImplicitParam(name = "lessonId", value = "课程ID(课程ID和开课ID只能存在一个)", required = false, dataType = "varchar")})
     @PostMapping(value = "/queryBChaptersByPagination")
@@ -165,14 +154,7 @@ public class BChapterController extends PaginationController<BChapter> {
 
     @ApiOperation(value="根据条件查询章节", notes="根据条件查询章节")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "slId", value = "开课id", required = true, dataType = "varchar"),
-            @ApiImplicitParam(name = "chapterName", value = "章节名称", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "chapterLevel", value = "等级，1：章 2：节", required = false, dataType = "Byte"),
-            @ApiImplicitParam(name = "pid", value = "上一级", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "chapterUrl", value = "课程url", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "mdFile", value = "任务书", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "isTest", value = "1:实验  2:视频   3:PPT'", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar"),
+            @ApiImplicitParam(name = "slId", value = "开课id", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "lessonOrSl", value = "课程或开课;0：开课  1：课程", required = true, dataType = "varchar"),
             @ApiImplicitParam(name = "lessonId", value = "课程ID(课程ID和开课ID只能存在一个)", required = false, dataType = "varchar")})
     @GetMapping(value = "/queryBChaptersWithoutAuth")

src/main/java/org/rcisoft/business/bchapter/dao/BChapterRepository.java

@@ -26,7 +26,7 @@ public interface BChapterRepository extends BaseMapper<BChapter> {
     * @return
     */
     @Select("<script>select * from b_chapter  " +
-            "where del_flag = 0 and flag = 1 and chapter_level = 1 " +
+            "where del_flag = 0 and flag = 1 and pid = -1 " +
             "<if test=\"slId!=null and slId != ''\">\n" +
             "   and sl_id = #{slId}\n" +
             "</if>" +
@@ -160,9 +160,9 @@ public interface BChapterRepository extends BaseMapper<BChapter> {
             "(create_date,create_by,update_date,update_by," +
             "del_flag,flag,business_id," +
             "sl_id,chapter_name,chapter_level,pid," +
-            "chapter_url,md_file,is_test,lesson_or_sl )VALUES" +
+            "chapter_url,md_file,is_test,lesson_or_sl)VALUES" +
             "<foreach collection=\"list\" item=\"item\" separator=\",\">" +
-            "( #{item.createDate},#{item.createBy},#{item.updateDate},#{item.updateBy}," +
+            "(#{item.createDate},#{item.createBy},#{item.updateDate},#{item.updateBy}," +
             "#{item.delFlag},#{item.flag},#{item.businessId}," +
             "#{item.slId},#{item.chapterName},#{item.chapterLevel},#{item.pid}," +
             "#{item.chapterUrl},#{item.mdFile},#{item.isTest},#{item.lessonOrSl})" +

src/main/java/org/rcisoft/business/bchapter/service/impl/BChapterServiceImpl.java

@@ -123,14 +123,12 @@ public class BChapterServiceImpl implements BChapterService {
         if(isChapter&&hasChild)
             throw new ServiceException(ResultServiceEnums.CHAPTER_HAS_CHILD);
 
-        String state = bSlRepository.queryStateById(id);
+        String state = bSlRepository.queryStateById(bChapter.getSlId());
         if(state.equals(AuditStatusEnum.PUBLISHED.getCode())){
             throw new ServiceException(ResultServiceEnums.CHAPTER_IS_USED);
         }
         bChapterRepository.deleteStudentChapter(id);
-        bChapterRepository.deleteByPrimaryKey(id);
-        UserUtil.setCurrentMergeOperation(bChapter);
-        int line = bChapterRepository.updateByPrimaryKeySelective(bChapter);
+        int line = bChapterRepository.deleteByPrimaryKey(id);
         return new PersistModel(line);
     }
 
@@ -181,6 +179,7 @@ public class BChapterServiceImpl implements BChapterService {
     @Transactional(propagation = Propagation.REQUIRED,readOnly = false)
     @Override
     public int addBslFormLesson(String bLseeonId, String lessonCode, String slId) {
+        int result = 0;
         if(bLseeonId==null){
             BLesson bLseeon = bLessonRepository.queryBLessonByCode(lessonCode);
             bLseeonId = bLseeon.getBusinessId();
@@ -218,9 +217,13 @@ public class BChapterServiceImpl implements BChapterService {
                 chapterList.get(i).setPid(String.valueOf(map.get(chapterName)));
             }
         }
-        return bChapterRepository.insertChapterList(chapterList);
+        if(chapterList.size()>0){
+            result = bChapterRepository.insertChapterList(chapterList);
+        }
+        return result;
     }
 
+    @Transactional(propagation = Propagation.REQUIRED,readOnly = false)
     @Override
     public int updateChapterState(BChapter bChapter) {
         String state = bChapterRepository.selectStateById(bChapter.getBusinessId());
@@ -242,6 +245,7 @@ public class BChapterServiceImpl implements BChapterService {
         return result;
     }
 
+    @Transactional(propagation = Propagation.REQUIRED,readOnly = false)
     @Override
     public int updateAllChapterState(String slId) {
         List<String> list = bChapterRepository.selectStateBySlId(slId);

src/main/java/org/rcisoft/business/bdirection/service/impl/BDirectionServiceImpl.java

@@ -46,6 +46,7 @@ public class BDirectionServiceImpl implements BDirectionService {
     }
 
 
+    @Transactional(propagation = Propagation.REQUIRED,readOnly = false)
     @Override
     public PersistModel persist(BDirection model){
         int line = 0;
@@ -60,6 +61,7 @@ public class BDirectionServiceImpl implements BDirectionService {
         return new PersistModel(line);
     }
 
+    @Transactional(propagation = Propagation.REQUIRED,readOnly = false)
     @Override
     public PersistModel removeDirection(String id) {
         if(bDirectionRepository.selectslNumById(id)>0) {

src/main/java/org/rcisoft/business/bimage/controller/BImageController.java

@@ -65,10 +65,7 @@ public class BImageController extends PaginationController<BImage> {
     @ApiOperation(value="根据条件分页查询", notes="根据URL中的参数分页查询")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "imageName", value = "图片标题", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "imageCode", value = "图片code", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "delFlag", value = "删除标记（0：正常；1：删除；2：审核）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "flag", value = "启用标记（0：停用；1：启用）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
+            @ApiImplicitParam(name = "imageCode", value = "图片code", required = false, dataType = "varchar")})
     @GetMapping(value = "/queryBImagesByPagination")
     public GridModel queryBImagesByPagination(BImage param) {
         param.setCreateBy(UserUtil.getUserInfoProp(getToken(),UserUtil.USER_ID));
@@ -80,10 +77,7 @@ public class BImageController extends PaginationController<BImage> {
     @ApiOperation(value="根据条件查询", notes="根据URL中的参数查询全部")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "imageName", value = "图片标题", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "imageCode", value = "图片code", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "delFlag", value = "删除标记（0：正常；1：删除；2：审核）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "flag", value = "启用标记（0：停用；1：启用）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
+            @ApiImplicitParam(name = "imageCode", value = "图片code", required = false, dataType = "varchar")})
     @GetMapping(value = "/queryBImages")
     public Result queryBImages(BImage param) {
         param.setCreateBy(UserUtil.getUserInfoProp(getToken(),UserUtil.USER_ID));

src/main/java/org/rcisoft/business/blesson/controller/BLessonController.java

@@ -47,11 +47,9 @@ public class BLessonController extends PaginationController<BLesson> {
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "code", value = "课程编号", required = true, dataType = "varchar"),
             @ApiImplicitParam(name = "lessonName", value = "课程名称", required = true, dataType = "varchar"),
-            @ApiImplicitParam(name = "defaultUrl", value = "默认封面图片url", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "classHour", value = "课时", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "credits", value = "学分", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "directionId", value = "课程方向ID", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
+            @ApiImplicitParam(name = "directionId", value = "课程方向ID", required = false, dataType = "varchar")})
     @PostMapping(value = "/add")
     @PreAuthorize("hasRole('ROLE_1001')")
     public Result add(@Valid BLesson bLesson, BindingResult bindingResult) {
@@ -171,12 +169,8 @@ public class BLessonController extends PaginationController<BLesson> {
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "code", value = "课程编号", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "lessonName", value = "课程名称", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "defaultUrl", value = "默认封面图片url", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "classHour", value = "课时", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "credits", value = "学分", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "delFlag", value = "删除标记（0：正常；1：删除；2：审核）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "flag", value = "启用标记（0：停用；1：启用）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
+            @ApiImplicitParam(name = "credits", value = "学分", required = false, dataType = "varchar")})
     @GetMapping(value = "/queryBLessonsByPagination")
     public GridModel queryBLessonsByPagination(BLesson param) {
         param.setCreateBy(UserUtil.getUserInfoProp(getToken(),UserUtil.USER_ID));
@@ -190,11 +184,7 @@ public class BLessonController extends PaginationController<BLesson> {
             @ApiImplicitParam(name = "code", value = "课程编号", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "lessonName", value = "课程名称", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "classHour", value = "课时", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "credits", value = "学分", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "defaultUrl", value = "默认封面图片url", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "delFlag", value = "删除标记（0：正常；1：删除；2：审核）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "flag", value = "启用标记（0：停用；1：启用）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
+            @ApiImplicitParam(name = "credits", value = "学分", required = false, dataType = "varchar")})
     @GetMapping(value = "/queryBLessons")
     public Result queryBLessons(BLesson param) {
         param.setCreateBy(UserUtil.getUserInfoProp(getToken(),UserUtil.USER_ID));

src/main/java/org/rcisoft/business/blesson/dao/BLessonRepository.java

@@ -24,7 +24,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
      * @param param
      * @return
      */
-    @Select("<script>select b.*, bd.name as directionName from b_lesson b " +
+    @Select("<script>select b.*, bd.name as directionName, bd.business_id as directionId from b_lesson b " +
             "left join b_lesson_direction bld on bld.lession_id = b.business_id " +
             "left join b_direction bd on bd.business_id = bld.direction_id "+
             "where b.del_flag != 1" +

src/main/java/org/rcisoft/business/brslstudent/service/impl/BRSlStudentServiceImpl.java

@@ -84,8 +84,8 @@ public class BRSlStudentServiceImpl implements BRSlStudentService {
         List<BRSlStudent> repeatCode = new ArrayList<>();
         ArrayList<String> slCode = new ArrayList<String>();
         ArrayList<String> studentCode = new ArrayList<String>();
-        ArrayList<String> gitlabP = new ArrayList<String>();
-        ArrayList<String> gitlabUser = new ArrayList<String>();
+        /*ArrayList<String> gitlabP = new ArrayList<String>();
+        ArrayList<String> gitlabUser = new ArrayList<String>();*/
 
         String[] headers = {"课序号","学号"};
         ArrayList<String[]> values = ExcelUtil.importExcel(hwb,headers);  //获取excel数据
@@ -118,10 +118,10 @@ public class BRSlStudentServiceImpl implements BRSlStudentService {
                 continue;
             }
 
-            if(bSl.getGitLabProjectId()==null){
+            /*if(bSl.getGitLabProjectId()==null){
                 gitlabP.add(value[0]);
                 continue;
-            }
+            }*/
 
             //2.封装git lab信息
             /*User user = userRepository.selectOne(new User(value[1]));
@@ -170,12 +170,12 @@ public class BRSlStudentServiceImpl implements BRSlStudentService {
         if(studentCode.size()>0){
             nullResult.append(" 以下学号不存在：").append(JSON.toJSONString(studentCode)).append("。");
         }
-        if(gitlabP.size()>0){
+        /*if(gitlabP.size()>0){
             nullResult.append(" 以下课程gitlab信息不存在（请重试导入开课）: ").append(this.sub(JSON.toJSONString(gitlabP))).append("。");
         }
         if(gitlabUser.size()>0){
             nullResult.append(" 以下学生gitlab信息不存在（请稍后重试）: ").append(JSON.toJSONString(gitlabUser)).append("。");
-        }
+        }*/
         result+=nullResult;
         if(brSlStudents.size()<1){
 

src/main/java/org/rcisoft/business/bsl/controller/BSlController.java

@@ -48,22 +48,9 @@ public class BSlController extends PaginationController<BSl> {
             @ApiImplicitParam(name = "lessonCode", value = "课程编号", required = true, dataType = "varchar"),
             @ApiImplicitParam(name = "teacherCode", value = "教师编号", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "termCode", value = "学期编号", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "isOnline", value = "是否上线，（0：待上线，1：已上线，2：已下线）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "slCoverUrl", value = "课程封面", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "slNotes", value = "课程简介", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "isRecommend", value = "是否推荐", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "recommendDate", value = "推荐日期", required = false, dataType = "datetime"),
-            @ApiImplicitParam(name = "recommendOrder", value = "推荐序号", required = false, dataType = "integer"),
-            @ApiImplicitParam(name = "recommendCourse", value = "推荐原因", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "gitLabProjectId", value = "gitlab项目id", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "gitLabProjectName", value = "gitlab项目名", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "classHour", value = "课时", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "credits", value = "学分", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "directionId", value = "课程方向ID", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "delFlag", value = "删除标记（0：正常；1：删除；2：审核,3已驳回）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "delFlag", value = "删除标记（0：正常；1：删除；2：审核）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "flag", value = "启用标记（0：停用；1：启用）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
+            @ApiImplicitParam(name = "directionId", value = "课程方向ID", required = false, dataType = "varchar")})
     @PreAuthorize("hasRole('ROLE_1001')")
     @PostMapping(value = "/add")
     public Result add(@Valid BSl bSl, BindingResult bindingResult) throws UnsupportedEncodingException {
@@ -124,22 +111,10 @@ public class BSlController extends PaginationController<BSl> {
             @ApiImplicitParam(name = "lessonCode", value = "课程编号", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "teacherCode", value = "教师编号", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "termCode", value = "学期编号", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "isOnline", value = "是否上线，（0：待上线，1：已上线，2：已下线）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "slCoverUrl", value = "课程封面", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "slNotes", value = "课程简介", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "isRecommend", value = "是否推荐", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "recommendDate", value = "推荐日期", required = false, dataType = "datetime"),
-            @ApiImplicitParam(name = "recommendOrder", value = "推荐序号", required = false, dataType = "integer"),
-            @ApiImplicitParam(name = "recommendCourse", value = "推荐原因", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "gitLabProjectId", value = "gitlab项目id", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "gitLabProjectName", value = "gitlab项目名", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "teacherName", value = "教师姓名", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "lessonName", value = "课程名称", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "termName", value = "学期名称", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "auditStatus", value = "审核状态 0:待发布,1审核中,2已发布,3已驳回", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "delFlag", value = "删除标记（0：正常；1：删除；2：审核）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "flag", value = "启用标记（0：停用；1：启用）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
+            @ApiImplicitParam(name = "auditStatus", value = "审核状态 0:待发布,1审核中,2已发布,3已驳回", required = false, dataType = "varchar")})
     @GetMapping(value = "/queryBSlsByPagination")
     public GridModel queryBSlsByPagination(BSl param) {
         param.setCreateBy(UserUtil.getUserInfoProp(getToken(),UserUtil.USER_ID));
@@ -154,20 +129,9 @@ public class BSlController extends PaginationController<BSl> {
             @ApiImplicitParam(name = "lessonCode", value = "课程编号", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "teacherCode", value = "教师编号", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "termCode", value = "学期编号", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "isOnline", value = "是否上线，（0：待上线，1：已上线，2：已下线）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "slCoverUrl", value = "课程封面", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "slNotes", value = "课程简介", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "isRecommend", value = "是否推荐", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "recommendDate", value = "推荐日期", required = false, dataType = "datetime"),
-            @ApiImplicitParam(name = "recommendOrder", value = "推荐序号", required = false, dataType = "integer"),
-            @ApiImplicitParam(name = "recommendCourse", value = "推荐原因", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "gitLabProjectId", value = "gitlab项目id", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "gitLabProjectName", value = "gitlab项目名", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "teacherName", value = "教师姓名", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "lessonName", value = "课程名称", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "termName", value = "学期名称", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "flag", value = "启用标记（0：停用；1：启用）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
+            @ApiImplicitParam(name = "termName", value = "学期名称", required = false, dataType = "varchar")})
     @GetMapping(value = "/queryBSls")
     public Result queryBSls(BSl param) {
         param.setCreateBy(UserUtil.getUserInfoProp(getToken(),UserUtil.USER_ID));
@@ -337,7 +301,7 @@ public class BSlController extends PaginationController<BSl> {
 
     @ApiOperation(value="开课审核", notes="开课审核")
     @ApiImplicitParams({@ApiImplicitParam(name = "slId", value = "开课ID", required = true, dataType = "varchar"),
-            @ApiImplicitParam(name = "status", value = "要变成的状态0:待发布,1审核中,2已发布,3已驳回", required = false, dataType = "varchar"),
+            @ApiImplicitParam(name = "status", value = "要变成的状态0:待发布,1审核中,2已发布,3已驳回,结课", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "opinion", value = "驳回意见（通过不用写意见）", required = false, dataType = "varchar")})
     @PostMapping("/auditBsl")
     public Result auditBsl(String slId, String status, String opinion){

src/main/java/org/rcisoft/business/bsl/enums/AuditStatusEnum.java

@@ -11,7 +11,8 @@ public enum AuditStatusEnum {
     WAIT_RELEASE("0"),  //待发布
     AUDITING("1"),  //审核中
     PUBLISHED("2"), //已发布
-    DISMISSAL("3") //已驳回
+    DISMISSAL("3"), //已驳回
+    END_LESSON("4"),//结课
     ;
     private String code;
 

src/main/java/org/rcisoft/business/bsl/service/impl/BSlServiceImpl.java

@@ -359,6 +359,7 @@ public class BSlServiceImpl implements BSlService {
         return bSlRepository.historySlByCodeByPagination(lessonName,term,studentCode,teacherCode);
     }
 
+    @Transactional(propagation = Propagation.REQUIRED,readOnly = false)
     @Override
     public int auditBsl(String slId, String status, String opinion) {
         int result = 0;
@@ -373,7 +374,9 @@ public class BSlServiceImpl implements BSlService {
             bOpinion.setOpinion(opinion);
             bOpinion.setSlId(slId);
             bOpinionRepository.insert(bOpinion);
-            result = bSlRepository.updateAuditStatus(slId, AuditStatusEnum.DISMISSAL.getCode());
+            result = bSlRepository.updateAuditStatus(slId, AuditStatusEnum.WAIT_RELEASE.getCode());
+        }else if(status.equals(AuditStatusEnum.END_LESSON.getCode())) {//结课
+            result = bSlRepository.updateAuditStatus(slId, AuditStatusEnum.END_LESSON.getCode());
         }else{//待发布
             result = bSlRepository.updateAuditStatus(slId, AuditStatusEnum.WAIT_RELEASE.getCode());
         }

src/main/java/org/rcisoft/business/bvideo/controller/BVideoController.java

@@ -112,13 +112,6 @@ public class BVideoController extends PaginationController<BVideo> {
             @ApiImplicitParam(name = "videoName", value = "视频名称", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "videoUrl", value = "视频地址", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "type", value = "'0'为视频，'1'为附件", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "createBy", value = "创建者", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "createDate", value = "创建日期", required = false, dataType = "datetime"),
-            @ApiImplicitParam(name = "updateBy", value = "更新者", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "updateDate", value = "更新日期", required = false, dataType = "datetime"),
-            @ApiImplicitParam(name = "delFlag", value = "删除标记（0：正常；1：删除；2：审核）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "flag", value = "启用标记（0：停用；1：启用）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "file", value = "视频文件", required = true, dataType = "MultipartFile")})
     @PreAuthorize("hasRole('ROLE_1002')")
     @PostMapping(value = "/uploadVideo")

src/main/resources/mapper/business/bchapter/mapper/BChapterMapper.xml

@@ -19,6 +19,7 @@
         <result column="md_file" jdbcType="LONGVARCHAR" property="mdFile"/>
         <result column="lesson_or_sl" jdbcType="VARCHAR" property="lessonOrSl"/>
         <result column="lesson_id" jdbcType="VARCHAR" property="lessonId"/>
+        <result column="class_hour" jdbcType="VARCHAR" property="classHour"/>
         <result column="state" jdbcType="VARCHAR" property="state"/>
     </resultMap>
 

src/main/resources/mapper/business/blesson/mapper/BLessonMapper.xml

@@ -15,5 +15,7 @@
           <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
           <result column="class_hour" jdbcType="VARCHAR" property="classHour"/>
           <result column="credits" jdbcType="VARCHAR" property="credits"/>
+          <result column="directionName" jdbcType="VARCHAR" property="directionName"/>
+          <result column="directionId" jdbcType="VARCHAR" property="directionId"/>
      </resultMap>
 </mapper>
\ No newline at end of file