banner排序

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

@@ -246,4 +246,22 @@ public class BLessonController extends PaginationController<BLesson> {
                 MessageConstant.MESSAGE_ALERT_ERROR,
                 bLessonPersonService.iLearnLessonCount(userId));
     }
+
+    /**
+     * @author: jiangpengpeng
+     * @description: TODO
+     * @date: 2019/9/27 14:37
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "617课程管理显示的全部课程", notes="课程管理显示的全部课程")
+    @GetMapping(value = "theLessonManage")
+    public Result theLessonManage(CurUser curUser, @Valid BLesson bLesson, BindingResult bindingResult){
+        List<BLesson> bLessons = bLessonService.theLessonMangageByPagination(getPaginationUtility(), curUser, bLesson);
+        GridModel gridModel = getGridModelResponse();
+        return Result.builder(new PersistModel(1),
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                gridModel);
+    }
 }

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

@@ -8,9 +8,11 @@ import org.rcisoft.business.blesson.dto.ILessonCountDTO;
 import org.rcisoft.business.blesson.entity.BLesson;
 import org.rcisoft.business.blesson.entity.BLessonLabel;
 import org.rcisoft.core.base.BaseMapper;
+import org.rcisoft.sys.user.bean.CurUser;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * Created with CodeGenerator on .
@@ -29,7 +31,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
             "<if test=\"releaseState!=null and releaseState != ''\">and release_state = #{releaseState} </if>" +
             "order by update_date desc</script>")
     @ResultMap(value = "BaseResultMap")
-    List<BLesson> queryBLessons(@Param("releaseState") String releaseState,@Param("lecturerId") String lecturerId);
+    List<BLesson> queryBLessons(@Param("releaseState") String releaseState, @Param("lecturerId") String lecturerId);
 
 
     @Select("<script>select bl.*,bld.direction_id as directionId from b_lesson bl " +
@@ -50,6 +52,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
 
     /**
      * 课程新增 添加标签
+     *
      * @param bLessons
      * @return
      */
@@ -63,6 +66,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
 
     /**
      * 根据课程id删除课程-标签表
+     *
      * @param model
      * @return
      */
@@ -71,6 +75,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
 
     /**
      * 单一查询课程信息
+     *
      * @param businessId
      * @return
      */
@@ -93,6 +98,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
 
     /**
      * 根据条件查询课程并案发布时间排序
+     *
      * @param param
      * @return
      */
@@ -122,6 +128,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
 
     /**
      * 按学习人数降序查询
+     *
      * @param
      * @return
      */
@@ -150,6 +157,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
 
     /**
      * 按学习人数降序查询推荐
+     *
      * @param
      * @return
      */
@@ -187,10 +195,11 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
             " order by br.update_date " +
             "</script>")
     @ResultMap(value = "BaseResultMap")
-    List<BLesson> queryRecommend(@Param("userId") String userId,@Param("departs") List<String> departs);
+    List<BLesson> queryRecommend(@Param("userId") String userId, @Param("departs") List<String> departs);
 
     /**
      * 按学习人数降序查询
+     *
      * @param
      * @return
      */
@@ -236,7 +245,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
     @ResultMap(value = "BaseResultMap")
     List<BLesson> queryConcern(@Param("userId") String userId, @Param("departs") List<String> departs);
 
-//    @Select(" <script> select bl.* " +
+    //    @Select(" <script> select bl.* " +
 //            " ,su.name lecturerName " +
 //            " ,suc.name createByName " +
 //            " from b_lesson bl " +
@@ -250,45 +259,45 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
 //            " order by bl.hot_number desc " +
 //            "</script>")
 //    @ResultMap(value = "BaseResultMap")
-@Select(" <script> SELECT b.* " +
-        " ,su.name lecturerName " +
-        " ,suc.name createByName " +
-        " FROM " +
-        " b_lesson b " +
-        " LEFT JOIN b_lesson_label bl ON b.business_id = bl.lesson_id" +
-        " inner JOIN ( " +
-        "   SELECT " +
-        "   bla.business_id AS bussinessId, " +
-        "   count( 1 ) AS bsum  " +
-        "   FROM " +
-        "   b_label bla " +
-        "   LEFT JOIN b_lesson_label bl ON bla.business_id = bl.label_id " +
-        "   LEFT JOIN b_lesson b ON bl.lesson_id = b.business_id " +
-        "   LEFT JOIN b_lesson_person bp ON b.business_id = bp.lesson_id " +
-        "   WHERE " +
-        "   bp.person_id = #{userId} " +
-        "   and b.del_flag != 1 and b.flag = 1  " +
-        "   and bp.del_flag != 1 and bp.flag = 1  " +
-        "   GROUP BY " +
-        "   bla.business_id " +
-        " ) T ON T.bussinessId = bl.label_id " +
-        " left join s_user su on su.business_id = b.lecturer_id " +
-        " left join s_user suc on suc.business_id = b.create_by " +
-        " left join b_viewrange bv on bl.business_id = bv.lesson_id " +
-        " left join b_viewrange_son bvs on bv.business_id = bvs.viewrange_id " +
-        " where b.del_flag != 1 and b.flag = 1 " +
-        " and su.del_flag != 1 and su.flag = 1  " +
-        " and suc.del_flag != 1 and suc.flag = 1  " +
-        " and bv.del_flag != 1 and bv.flag = 1  " +
-        " and b.business_id not in (SELECT DISTINCT  b.business_id from " +
-        " b_lesson b left join b_lesson_person  blp on b.business_id = blp.lesson_id " +
-        " where blp.person_id = #{userId} )  " +
-        " and b.release_state = 2 " +
-        " and ((bvs.type = 0 and bvs.target_id = #{userId}) " +
-        "      or (bvs.type = 1 and bvs.target_id in " +
-        " <foreach item='item' index='index' collection='departs' open='(' separator=',' close=')'> #{item} </foreach>)) " +
-        " order by T.bsum , b.collect_number " +
-        "</script>")
+    @Select(" <script> SELECT b.* " +
+            " ,su.name lecturerName " +
+            " ,suc.name createByName " +
+            " FROM " +
+            " b_lesson b " +
+            " LEFT JOIN b_lesson_label bl ON b.business_id = bl.lesson_id" +
+            " inner JOIN ( " +
+            "   SELECT " +
+            "   bla.business_id AS bussinessId, " +
+            "   count( 1 ) AS bsum  " +
+            "   FROM " +
+            "   b_label bla " +
+            "   LEFT JOIN b_lesson_label bl ON bla.business_id = bl.label_id " +
+            "   LEFT JOIN b_lesson b ON bl.lesson_id = b.business_id " +
+            "   LEFT JOIN b_lesson_person bp ON b.business_id = bp.lesson_id " +
+            "   WHERE " +
+            "   bp.person_id = #{userId} " +
+            "   and b.del_flag != 1 and b.flag = 1  " +
+            "   and bp.del_flag != 1 and bp.flag = 1  " +
+            "   GROUP BY " +
+            "   bla.business_id " +
+            " ) T ON T.bussinessId = bl.label_id " +
+            " left join s_user su on su.business_id = b.lecturer_id " +
+            " left join s_user suc on suc.business_id = b.create_by " +
+            " left join b_viewrange bv on bl.business_id = bv.lesson_id " +
+            " left join b_viewrange_son bvs on bv.business_id = bvs.viewrange_id " +
+            " where b.del_flag != 1 and b.flag = 1 " +
+            " and su.del_flag != 1 and su.flag = 1  " +
+            " and suc.del_flag != 1 and suc.flag = 1  " +
+            " and bv.del_flag != 1 and bv.flag = 1  " +
+            " and b.business_id not in (SELECT DISTINCT  b.business_id from " +
+            " b_lesson b left join b_lesson_person  blp on b.business_id = blp.lesson_id " +
+            " where blp.person_id = #{userId} )  " +
+            " and b.release_state = 2 " +
+            " and ((bvs.type = 0 and bvs.target_id = #{userId}) " +
+            "      or (bvs.type = 1 and bvs.target_id in " +
+            " <foreach item='item' index='index' collection='departs' open='(' separator=',' close=')'> #{item} </foreach>)) " +
+            " order by T.bsum , b.collect_number " +
+            "</script>")
     List<BLesson> queryInterested(@Param("userId") String userId, @Param("departs") List<String> departs);
 
     //查询课程中的标签
@@ -321,10 +330,11 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
             " order by bl.person_number desc " +
             "</script>")
     @ResultMap(value = "BaseResultMap")
-    List<BLesson> queryHomeBLesson(@Param("param") FirstPageQueryDTO firstPageQueryDTO,@Param("courseIds") List<String> sonCourseIds);
+    List<BLesson> queryHomeBLesson(@Param("param") FirstPageQueryDTO firstPageQueryDTO, @Param("courseIds") List<String> sonCourseIds);
 
     /**
      * 根据课程id关闭课程
+     *
      * @param model
      * @return
      */
@@ -344,12 +354,45 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
             " select (select COUNT(1)  from b_lesson where lecturer_id = #{userId} ) publishAllCount, " +
                     "(select COUNT(1)  from b_lesson where lecturer_id = #{userId} and release_state = '0') notPublishCount, " +
                     "(select COUNT(1)  from b_lesson where lecturer_id = #{userId} and release_state = '2') publishedCount, " +
-                    "(select COUNT(1)  from b_lesson where lecturer_id = #{userId} and release_state = '4') closedCount, "+
+                    "(select COUNT(1)  from b_lesson where lecturer_id = #{userId} and release_state = '4') closedCount, " +
                     "(select COUNT(1)  from b_lesson_person where person_id = #{userId} ) learnAllCount, " +
                     "(select COUNT(1)  from b_lesson_person where person_id = #{userId} and is_finish = '1') finishCount, " +
                     "(select COUNT(1)  from b_lesson_person where person_id = #{userId} and is_finish = '0') notFinishCount " +
-            "</script>"})
+                    "</script>"})
     ILessonCountDTO iLessonCount(String userId);
 
+
+    //查询管理的全部课程
+    //isAdmin  <if test= " ！isAdmin ">
+    //                teacher in (uid)
+    //         </IF>
+    @Select("<script>" +
+            "SELECT " +
+            "les.*,  " +
+            "CONCAT( " +
+            "IFNULL(CONCAT(b3.c_name,\".\"),\"\"), " +
+            "IFNULL(CONCAT(b2.c_name,\".\"),\"\"), " +
+            "  IFNULL(b1.c_name,\"\") " +
+            ") AS courseName " +
+            "FROM " +
+            "b_lesson les " +
+            "LEFT JOIN b_course b1 ON b1.business_id = les.course_id " +
+            "LEFT JOIN b_course b2 ON b2.business_id = b1.pid " +
+            "LEFT JOIN b_course b3 ON b3.business_id = b2.pid " +
+            "LEFT JOIN s_user u1 ON u1.business_id = les.lecturer_id " +
+            "WHERE 1 = 1 " +
+            "<if test='!isAdmin'>" +
+            "AND les.lecturer_id IN" +
+            "<foreach item='item' index='index' collection='CurUserSet' open='(' close=')' separator=','> " +
+            "#{item.userId} " +
+            "</foreach>" +
+            "</if> " +
+            "<if test=\"bLesson.lessonName!=null and bLesson.lessonName!=''\">AND les.lesson_name like '%${bLesson.lessonName}%' </if>" +
+            "<if test=\"bLesson.lecturerId!=null and bLesson.lecturerId!=''\">AND u1.name like '%${bLesson.lecturerId}%' </if>" +
+            "<if test=\"bLesson.releaseState!=null and bLesson.releaseState!=''\">AND les.release_state = #{bLesson.releaseState} </if>" +
+            " order by les.release_date desc </script>")
+    @ResultMap(value = "BaseResultMap")
+    List<BLesson> selectAllManageLesson(@Param("CurUserSet") Set<CurUser> CurUserSet, @Param("bLesson") BLesson bLesson, @Param("isAdmin") boolean isAdmin);
+
 }
 

src/main/java/org/rcisoft/business/blesson/entity/BLesson.java

@@ -71,7 +71,7 @@ public class BLesson extends IdEntity<BLesson> {
     private String viewRange;
 
     @ApiModelProperty(value = "发布时间")
-    @Length(min = 1,max = 1,message = "长度最小为1,最大为1")
+    //@Length(min = 1,max = 1,message = "长度最小为1,最大为1")
     private Date releaseDate;
 
     @ApiModelProperty(value = "课程类型（0：课程 1：培训）")
@@ -121,5 +121,10 @@ public class BLesson extends IdEntity<BLesson> {
     @ApiModelProperty(value = "分类名")
     @Transient
     private String courseName;
+
+
+
+
+
 }
 

src/main/java/org/rcisoft/business/blesson/service/BLessonService.java

@@ -5,6 +5,7 @@ import org.rcisoft.business.blesson.dto.*;
 import org.rcisoft.business.blesson.entity.BLesson;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
+import org.rcisoft.sys.user.bean.CurUser;
 
 import java.util.List;
 
@@ -118,4 +119,12 @@ public interface BLessonService{
      */
     ILessonCountDTO iLessonCount(String userId);
 
+     /**
+      * @author: jiangpengpeng
+      * @description: 分页查找课程管理数据
+      * @date: 2019/9/27 14:44
+      * @param
+      * @return
+      */
+      List<BLesson> theLessonMangageByPagination(PageUtil pageUtil,CurUser curUser,BLesson bLesson);
 }

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java

 package org.rcisoft.business.blesson.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.sun.org.apache.regexp.internal.RE;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -17,16 +18,16 @@ import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.constant.MessageConstant;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.util.UserUtil;
+import org.rcisoft.sys.user.bean.CurUser;
+import org.rcisoft.sys.user.dao.SysUserMapper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.lang.reflect.Array;
+import java.util.*;
 
 
 /**
@@ -34,7 +35,7 @@ import java.util.Map;
  */
 @Slf4j
 @Service
-@Transactional(readOnly = true,propagation = Propagation.NOT_SUPPORTED)
+@Transactional(readOnly = true, propagation = Propagation.NOT_SUPPORTED)
 public class BLessonServiceImpl implements BLessonService {
     @Autowired
     private BLessonRepository bLessonRepository;
@@ -42,12 +43,15 @@ public class BLessonServiceImpl implements BLessonService {
     @Autowired
     private BCourseRepository bCourseRepository;
 
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
     @Autowired
     private Global global;
 
 
     @Override
-    public BLesson selectOne(String businessId){
+    public BLesson selectOne(String businessId) {
         return bLessonRepository.selectInfoById(businessId);
     }
 
@@ -56,9 +60,9 @@ public class BLessonServiceImpl implements BLessonService {
         return bLessonRepository.selectOne(bLesson);
     }
 
-    @Transactional(propagation = Propagation.REQUIRED,readOnly = false)
+    @Transactional(propagation = Propagation.REQUIRED, readOnly = false)
     @Override
-    public int  updateByPrimaryKeySelective(BLesson bLesson) {
+    public int updateByPrimaryKeySelective(BLesson bLesson) {
         return bLessonRepository.updateByPrimaryKeySelective(bLesson);
     }
 
@@ -78,43 +82,45 @@ public class BLessonServiceImpl implements BLessonService {
         departs.add("1");
         departs.add("2");
         departs.add("3");
-        return bLessonRepository.queryPersonMore(userId,departs);
+        return bLessonRepository.queryPersonMore(userId, departs);
     }
+
     @Override
-    public List<BLesson> queryRecommendByPagination(PageUtil pageUtil,String userId) {
+    public List<BLesson> queryRecommendByPagination(PageUtil pageUtil, String userId) {
         List<String> departs = new ArrayList<>();
         departs.add("1");
         departs.add("2");
         departs.add("3");
-        return bLessonRepository.queryRecommend(userId,departs);
+        return bLessonRepository.queryRecommend(userId, departs);
     }
+
     @Override
-    public List<BLesson> queryConcernByPagination(PageUtil pageUtil,String userId) {
+    public List<BLesson> queryConcernByPagination(PageUtil pageUtil, String userId) {
         List<String> departs = new ArrayList<>();
         departs.add("1");
         departs.add("2");
         departs.add("3");
-        return bLessonRepository.queryConcern(userId,departs);
+        return bLessonRepository.queryConcern(userId, departs);
     }
 
     @Override
-    public List<BLesson> queryInterestedByPagination(PageUtil pageUtil,String userId) {
+    public List<BLesson> queryInterestedByPagination(PageUtil pageUtil, String userId) {
         List<String> departs = new ArrayList<>();
         departs.add("1");
         departs.add("2");
         departs.add("3");
-        return bLessonRepository.queryInterested(userId,departs);
+        return bLessonRepository.queryInterested(userId, departs);
     }
 
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRED,readOnly = false)
-    public PersistModel persist(AddLessonDTO addLessonDTO){
+    @Transactional(propagation = Propagation.REQUIRED, readOnly = false)
+    public PersistModel persist(AddLessonDTO addLessonDTO) {
         BLesson model = new BLesson();
-        BeanUtils.copyProperties(addLessonDTO,model);
+        BeanUtils.copyProperties(addLessonDTO, model);
         int line = 0;
         List<BLessonLabel> bLessonLabels = new ArrayList<>();
-        if(model.getBusinessId()==null) {
+        if (model.getBusinessId() == null) {
             model.setDefaultUrl(global.getDEFAULT_COURSE_LOCATION());
             UserUtil.setCurrentPersistOperation(model);
             //设置状态为待发布
@@ -136,9 +142,9 @@ public class BLessonServiceImpl implements BLessonService {
             //添加课程表
             line = bLessonRepository.insertSelective(model);
             //添加课程标签表
-            if (StringUtils.isNotEmpty(model.getLabels())){
+            if (StringUtils.isNotEmpty(model.getLabels())) {
                 String[] labels = model.getLabels().split(",");
-                for (int index = 0 ; index<labels.length;index++){
+                for (int index = 0; index < labels.length; index++) {
                     BLessonLabel bLessonLabel = new BLessonLabel();
                     UserUtil.setCurrentPersistOperation(bLessonLabel);
                     bLessonLabel.setLabelId(labels[index]);
@@ -147,14 +153,14 @@ public class BLessonServiceImpl implements BLessonService {
                 }
                 bLessonRepository.insertLessonLabel(bLessonLabels);
             }
-        }else {
+        } else {
             UserUtil.setCurrentMergeOperation(model);
             line = bLessonRepository.updateByPrimaryKeySelective(model);
             bLessonRepository.removeLabelByLessonId(model);
             //删除原标签添，加课程标签表
-            if (StringUtils.isNotEmpty(model.getLabels())){
+            if (StringUtils.isNotEmpty(model.getLabels())) {
                 String[] labels = model.getLabels().split(",");
-                for (int index = 0 ; index<labels.length;index++){
+                for (int index = 0; index < labels.length; index++) {
                     BLessonLabel bLessonLabel = new BLessonLabel();
                     UserUtil.setCurrentPersistOperation(bLessonLabel);
                     bLessonLabel.setLabelId(labels[index]);
@@ -168,7 +174,7 @@ public class BLessonServiceImpl implements BLessonService {
     }
 
 
-    @Transactional(propagation = Propagation.REQUIRED,readOnly = false)
+    @Transactional(propagation = Propagation.REQUIRED, readOnly = false)
     @Override
     public PersistModel removeBLesson(String id) {
 //        if(bSlRepository.selectslNumByLesson(id)>0) {
@@ -188,12 +194,12 @@ public class BLessonServiceImpl implements BLessonService {
     }
 
     @Override
-    public List<BLesson> queryHomeBLessonsByPagination(PageUtil pageUtil, FirstPageQueryDTO firstPageQueryDTO,List<AllCourseDTO> allCourse) {
+    public List<BLesson> queryHomeBLessonsByPagination(PageUtil pageUtil, FirstPageQueryDTO firstPageQueryDTO, List<AllCourseDTO> allCourse) {
         List<String> sonCourseIds = null;
-        if (allCourse != null){
-            sonCourseIds = recursion.FindSons(firstPageQueryDTO.getCourseLevelOne(),allCourse);
+        if (allCourse != null) {
+            sonCourseIds = recursion.FindSons(firstPageQueryDTO.getCourseLevelOne(), allCourse);
         }
-        return bLessonRepository.queryHomeBLesson(firstPageQueryDTO,sonCourseIds);
+        return bLessonRepository.queryHomeBLesson(firstPageQueryDTO, sonCourseIds);
     }
 
     @Override
@@ -216,4 +222,26 @@ public class BLessonServiceImpl implements BLessonService {
         return bLessonRepository.iLessonCount(userId);
     }
 
+    @Override
+    public List<BLesson> theLessonMangageByPagination(PageUtil pageUtil, CurUser curUser, BLesson bLesson) {
+        String userId = curUser.getUserId();
+        //查询当前登录人有什么角色
+        List<String> roleList = sysUserMapper.queryRoleTypeByUserId(userId);
+        boolean isAdmin = false;
+        Set<CurUser> uids = new HashSet<>();
+        for (String role : roleList) {
+            if ("1".equals(role)) {
+                isAdmin = true;
+                break;
+            } else if ("2".equals(role)) {
+                // 调用 feign 获取当前部门及子部门 --->所有人
+                uids.addAll(Arrays.asList(new CurUser(), new CurUser()));
+            }
+        }
+        //自己
+        uids.add(curUser);
+        //查讯课程的语句
+        List<BLesson> bLessons = bLessonRepository.selectAllManageLesson(uids,bLesson, isAdmin);
+        return bLessons;
+    }
 }

src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

@@ -160,4 +160,12 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     int deleteTeacherUserRole(List<SysUser> userTeacherList);
 
     int deleteCompanyUserRole(List<SysUser> userCompanyList);
+
+    @Select("<script>SELECT sr.type AS roleList  " +
+            "FROM s_user AS su " +
+            "LEFT JOIN s_r_user_role AS ru ON su.business_id = ru.user_id " +
+            "LEFT JOIN s_role AS sr ON ru.role_id = sr.business_id  " +
+            "WHERE su.del_flag = 0  " +
+            "AND su.business_id = #{userId}</script>")
+    List<String> queryRoleTypeByUserId(@Param("userId")String userId);
 }