Merge remote-tracking branch 'origin/master'

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

@@ -324,4 +324,12 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @return
      */
     MusicGroup findByClassGroupId(Integer classGroupId);
+
+    /**
+     * 根据分部和教务老师查询乐团列表
+     * @param educationId
+     * @param organIds
+     * @return
+     */
+    List<String> queryIdsByEduIdAndOrganIds(@Param("educationId") Integer educationId, @Param("organIds") String organIds);
 }

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

@@ -16,4 +16,11 @@ public interface IndexBaseMonthDataService extends BaseService<Long, IndexBaseMo
 
     List<IndexErrInfoDto> getIndexErrData(String organIds);
 
+    /**
+     * 事项提醒
+     * @param organIds
+     * @return
+     */
+    List<IndexErrInfoDto> getRemindMatterData(String organIds);
+
 }

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

@@ -1,5 +1,9 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.dao.MusicGroupDao;
 import com.ym.mec.biz.dal.dao.OrganizationDao;
 import com.ym.mec.biz.dal.dto.IndexBaseDto;
 import com.ym.mec.biz.dal.entity.IndexErrInfoDto;
@@ -7,6 +11,7 @@ import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.common.constant.CommonConstants;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.date.DateUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -31,6 +36,12 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 	private IndexBaseMonthDataDao indexBaseMonthDataDao;
 	@Autowired
 	private OrganizationDao organizationDao;
+	@Autowired
+	private EmployeeDao employeeDao;
+	@Autowired
+	private MusicGroupDao musicGroupDao;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
 
 	private static ThreadLocal<Set<Integer>> organIds = new ThreadLocal<Set<Integer>>(){
 		@Override
@@ -307,4 +318,17 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 		return result;
 	}
+
+	@Override
+	public List<IndexErrInfoDto> getRemindMatterData(String organIds) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			throw new BizException("用户信息获取失败");
+		}
+		//当前用户是否是分部经理
+		List<Integer> userRole = employeeDao.queryUserRole(sysUser.getId());
+		List<String> musicGroupIds = musicGroupDao.queryIdsByEduIdAndOrganIds(userRole.contains(3)?sysUser.getId():null,organIds);
+		//获取关联的乐团列表
+		return null;
+	}
 }

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

@@ -630,4 +630,7 @@
 		LEFT JOIN class_group cg ON cg.music_group_id_ = mg.id_
 		WHERE cg.id_ = #{classGroupId} LIMIT 1
     </select>
+    <select id="queryIdsByEduIdAndOrganIds" resultType="java.lang.String">
+        SELECT * FROM music_group
+    </select>
 </mapper>