1、vip课活动方案根据部门查询

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/VipGroupActivityDao.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.VipGroupActivity;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -13,7 +14,7 @@ public interface VipGroupActivityDao extends BaseDAO<Integer, VipGroupActivity>
      * @Date: 2019/10/2
      * 根据课程类型获取vip课 活动方案
      */
-    List<VipGroupActivity> findByCategory(Long categoryId);
+    List<VipGroupActivity> findByCategory(@Param("categoryId") Long categoryId,@Param("organIds") String organIds);
 
     /**
      * 根据活动方案编号列表获取名称
@@ -21,4 +22,4 @@ public interface VipGroupActivityDao extends BaseDAO<Integer, VipGroupActivity>
      * @return
      */
     List<Map<Integer, String>> queryNamesById(String activityIds);
-}
+}

mec-biz/src/main/java/com/ym/mec/biz/service/VipGroupActivityService.java

@@ -27,6 +27,6 @@ public interface VipGroupActivityService extends BaseService<Integer, VipGroupAc
      * @Date: 2019/10/2
      * 根据课程类型获取VIP课相关活动方案
      */
-    List<VipGroupActivity> findByVipGroupCategory(Long categoryId);
+    List<VipGroupActivity> findByVipGroupCategory(Long categoryId, Integer teacherId);
 
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupActivityServiceImpl.java

@@ -1,9 +1,11 @@
 package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dao.VipGroupActivityDao;
 import com.ym.mec.biz.dal.dto.VipGroupActivityAddDto;
 import com.ym.mec.biz.dal.dto.VipGroupSalarySettlementDto;
+import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.entity.VipGroupActivity;
 import com.ym.mec.biz.service.VipGroupActivityService;
 import com.ym.mec.common.dal.BaseDAO;
@@ -20,6 +22,8 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 	
 	@Autowired
 	private VipGroupActivityDao vipGroupActivityDao;
+	@Autowired
+	private TeacherDao teacherDao;
 
 	@Override
 	public BaseDAO<Integer, VipGroupActivity> getDAO() {
@@ -90,10 +94,24 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 	}
 
 	@Override
-	public List<VipGroupActivity> findByVipGroupCategory(Long categoryId) {
+	public List<VipGroupActivity> findByVipGroupCategory(Long categoryId, Integer teacherId) {
 		if(Objects.isNull(categoryId)){
 			throw new BizException("请选择课程形态!");
 		}
-		return vipGroupActivityDao.findByCategory(categoryId);
+		if(Objects.isNull(teacherId)){
+			throw new BizException("请指定教师");
+		}
+		Teacher teacher = teacherDao.get(teacherId);
+		if(Objects.isNull(teacher)){
+			throw new BizException("未找到指定教师");
+		}
+		String organIds = "";
+		if(Objects.nonNull(teacher.getOrganId())){
+			organIds = teacher.getOrganId();
+		}
+		if(Objects.nonNull(teacher.getFlowOrganRange())){
+			organIds=teacherId+","+teacher.getFlowOrganRange();
+		}
+		return vipGroupActivityDao.findByCategory(categoryId,organIds);
 	}
 }

mec-biz/src/main/resources/config/mybatis/VipGroupActivityMapper.xml

@@ -155,6 +155,7 @@
 			FIND_IN_SET( #{categoryId}, vip_group_category_id_list_ )
 			AND (NOW() < end_time_ OR end_time_ IS NULL)
 			AND del_flag_=0
+			AND INTE_ARRAY(organ_id_,#{organIds})
 	</select>
     <select id="queryNamesById" resultType="java.util.Map">
 		SELECT vga.id_ `key`,vga.name_ `value` FROM vip_group_activity vga WHERE FIND_IN_SET(vga.id_,#{activityIds}) AND vga.del_flag_=0

mec-teacher/src/main/java/com/ym/mec/teacher/controller/VipGroupActivityController.java

@@ -1,5 +1,7 @@
 package com.ym.mec.teacher.controller;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.VipGroupActivityAddDto;
 import com.ym.mec.biz.dal.page.VipGroupActivityQueryInfo;
 import com.ym.mec.biz.service.VipGroupActivityService;
@@ -21,6 +23,8 @@ public class VipGroupActivityController extends BaseController {
 
     @Autowired
     private VipGroupActivityService vipGroupActivityService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
 
     @ApiOperation(value = "新增vip课活动方案")
     @PostMapping("/addVipGroupActivity")
@@ -45,7 +49,11 @@ public class VipGroupActivityController extends BaseController {
     @ApiOperation(value = "根据课程类型获取对应课程活动方案")
     @GetMapping("/findByVipGroupCategory")
     public Object findByVipGroupCategory(Long categoryId){
-        return succeed(vipGroupActivityService.findByVipGroupCategory(categoryId));
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            return failed("用户信息获取失败");
+        }
+        return succeed(vipGroupActivityService.findByVipGroupCategory(categoryId,sysUser.getId()));
     }
 
 }

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupActivityController.java

@@ -93,12 +93,8 @@ public class VipGroupActivityController extends BaseController {
     @ApiOperation(value = "根据课程类型获取对应课程活动方案")
     @GetMapping("/findByVipGroupCategory")
     @PreAuthorize("@pcs.hasPermissions('vipGroupActivity/findByVipGroupCategory')")
-    public Object findByVipGroupCategory(Long categoryId){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
-            return failed("用户信息获取失败");
-        }
-        return succeed(vipGroupActivityService.findByVipGroupCategory(categoryId));
+    public Object findByVipGroupCategory(Long categoryId, Integer teacherId){
+        return succeed(vipGroupActivityService.findByVipGroupCategory(categoryId, teacherId));
     }
 
 }