update

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

@@ -116,12 +116,12 @@ public interface DemoGroupDao extends BaseDAO<Long, DemoGroup> {
      * @param organId
      * @return
      */
-    Map<String, Integer> queryDemoGroupNum(Integer organId);
+    Map<String, Integer> queryDemoGroupNum(@Param("organId") Integer organId);
     
     /**
      * 
      * @param organId
      * @return
      */
-    Integer queryCurrentMonthCoursesNum(Integer organId);
+    Integer queryCurrentMonthCoursesNum(@Param("organId") Integer organId);
 }

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

@@ -118,12 +118,12 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @param ogranId
      * @return
      */
-    Map<String,Integer> queryOrganMusicGroupNum(Integer ogranId);
+    Map<String,Integer> queryOrganMusicGroupNum(@Param("organId") Integer ogranId);
     
     /**
      * 查询本月乐团课程数
      * @param organId
      * @return
      */
-    Integer queryCurrentMonthCoursesNum(Integer organId);
+    Integer queryCurrentMonthCoursesNum(@Param("organId") Integer organId);
 }

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

@@ -215,7 +215,7 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * 查询学生数
      * @return
      */
-    Map<String,Integer> queryStudentNum(Integer organId);
+    Map<String,Integer> queryStudentNum(@Param("organId") Integer organId);
 
     /**
      * 根据乐团编号获取当前乐团所有已报名学员

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

@@ -21,5 +21,5 @@ public interface SysUserCashAccountDetailDao extends BaseDAO<Long, SysUserCashAc
      */
     int batchInsert(@Param("sysUserCashAccountDetails") List<SysUserCashAccountDetail> sysUserCashAccountDetails);
 
-    Map<String, Object> queryStatistics();
+    Map<String, Object> queryStatistics(@Param("organId") Integer organId);
 }

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

@@ -171,5 +171,5 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @param organId
      * @return
      */
-    Map<String,Integer> queryOrganTeacherNum(Integer organId);
+    Map<String,Integer> queryOrganTeacherNum(@Param("organId") Integer organId);
 }

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

@@ -234,12 +234,12 @@ public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
 	 * @param organId
 	 * @return
 	 */
-	Map<String, Integer> queryVipGroupNum(Integer organId);
+	Map<String, Integer> queryVipGroupNum(@Param("organId") Integer organId);
 	
 	/**
 	 * 查询当月vip课数量
 	 * @param organId
 	 * @return
 	 */
-	Integer queryCurrentMonthCoursesNum(Integer organId);
+	Integer queryCurrentMonthCoursesNum(@Param("organId") Integer organId);
 }

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

@@ -24,7 +24,7 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @param messageType
 	 * @return
 	 */
-	boolean batchSeoMessage(Set<Integer> userIds,MessageTypeEnum messageType, Object... args);
+	boolean batchSeoMessage(Set<Integer> userIds, MessageTypeEnum messageType, Object... args);
 
 	/**
 	 * 批量发送消息
@@ -33,10 +33,11 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @param content 消息内容
 	 * @param receivers 消息接受者
 	 * @param triggerTime 触发时间
+	 * @param group 组
 	 * @return
 	 */
 	public boolean batchSendMessage(MessageSender messageSender, String subject, String content, Map<Integer, String> receivers, Date triggerTime,
-									Integer readStatus, String memo);
+			Integer readStatus, String memo, String group);
 
 	/**
 	 * 发送消息
@@ -50,7 +51,7 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @return
 	 */
 	public void batchSendMessage(MessageSender messageSender, MessageTypeEnum messageType, Map<Integer, String> receivers, Date triggerTime,
-								 Integer readStatus, String url, Object... args);
+			Integer readStatus, String url, Object... args);
 
 	/**
 	 * 发送消息
@@ -63,10 +64,11 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @param triggerTime 触发时间
 	 * @param readStatus 阅读状态（0-未读  1-已读）
 	 * @param url 超链接地址
+	 * @param group 组
 	 * @return
 	 */
 	public void sendMessage(MessageSender messageSender, Integer userId, String title, String content, String receiver, Date triggerTime, Integer readStatus,
-							String url);
+			String url, String group);
 
 	/**
 	 * 发送验证码

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

@@ -1034,7 +1034,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 			Map<Integer, String> userIds = MapUtil.convertMybatisMap(studentRegistrationDao.findParentId(StringUtils.join(parentsPhones, ",")));
 			userIds = JSONObject.parseObject(JSONObject.toJSONString(userIds), HashMap.class);
 			String content = sysMessageConfigDao.findContent(MessageTypeEnum.SMS_BASICS_SKILL_APPLY_MESSAGE.getCode());
-			sysMessageService.batchSendMessage(MessageSender.YIMEI, "", content, userIds, new Date(), 0, "");
+			sysMessageService.batchSendMessage(MessageSender.YIMEI, "", content, userIds, new Date(), 0, "", "");
 		}
     }
 }

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

@@ -163,7 +163,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	@Override
 	@Async
 	public boolean batchSendMessage(MessageSender messageSender, String subject, String content, Map<Integer, String> receivers, Date triggerTime,
-									Integer readStatus, String memo) {
+									Integer readStatus, String memo, String group) {
 
 		if (receivers == null || receivers.size() == 0) {
 			throw new BizException("消息接收人不能为空");
@@ -250,7 +250,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	@Override
 	@Async
 	public void sendMessage(MessageSender messageSender, Integer userId, String title, String content, String receiver, Date triggerTime, Integer readStatus,
-							String url) {
+							String url, String group) {
 		if (StringUtils.isBlank(receiver)) {
 			throw new BizException("接收地址不能为空");
 		}

mec-student/src/main/java/com/ym/mec/student/controller/SysMessageController.java

@@ -126,7 +126,7 @@ public class SysMessageController extends BaseController {
 
 	@ApiOperation(value = "发送消息")
 	@PostMapping("/sendMessage")
-	public Object sendMessage(MessageSender messageSender, String content, String receiver, int readStatus, String url) {
+	public Object sendMessage(MessageSender messageSender, String content, String receiver, int readStatus, String url, String group) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
@@ -137,7 +137,7 @@ public class SysMessageController extends BaseController {
 		if (StringUtils.isBlank(mobileNo) || !CommonValidator.isMobileNo(mobileNo)) {
 			throw new BizException("请输入正确的手机号");
 		}
-		sysMessageService.sendMessage(messageSender, userId, "", content, receiver, null, readStatus, url);
+		sysMessageService.sendMessage(messageSender, userId, "", content, receiver, null, readStatus, url, group);
 		return succeed();
 	}
 }

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

@@ -125,7 +125,7 @@ public class SysMessageController extends BaseController {
 
 	@ApiOperation(value = "发送消息")
 	@PostMapping("/sendMessage")
-	public Object sendMessage(MessageSender messageSender, String content, String receiver, int readStatus, String url) {
+	public Object sendMessage(MessageSender messageSender, String content, String receiver, int readStatus, String url, String group) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
@@ -136,7 +136,7 @@ public class SysMessageController extends BaseController {
 		if (StringUtils.isBlank(mobileNo) || !CommonValidator.isMobileNo(mobileNo)) {
 			throw new BizException("请输入正确的手机号");
 		}
-		sysMessageService.sendMessage(messageSender, userId, "", content, receiver, null, readStatus, url);
+		sysMessageService.sendMessage(messageSender, userId, "", content, receiver, null, readStatus, url, group);
 		return succeed();
 	}
 }

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

@@ -78,7 +78,7 @@ public class IndexController extends BaseController {
 		
 		Integer demoGroupNum = demoGroupDao.queryCurrentMonthCoursesNum(organId);
 		
-		Map<String, Object> incomeExpendMap = sysUserCashAccountDetailDao.queryStatistics();
+		Map<String, Object> incomeExpendMap = sysUserCashAccountDetailDao.queryStatistics(organId);
 		
 		ModelMap model = new ModelMap();
 		model.put("musicDatas", musicDatas);

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

@@ -126,7 +126,7 @@ public class SysMessageController extends BaseController {
 
 	@ApiOperation(value = "发送消息")
 	@PostMapping("/sendMessage")
-	public Object sendMessage(MessageSender messageSender, String content, String receiver, int readStatus, String url) {
+	public Object sendMessage(MessageSender messageSender, String content, String receiver, int readStatus, String url, String group) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
@@ -137,7 +137,7 @@ public class SysMessageController extends BaseController {
 		if (StringUtils.isBlank(mobileNo) || !CommonValidator.isMobileNo(mobileNo)) {
 			throw new BizException("请输入正确的手机号");
 		}
-		sysMessageService.sendMessage(messageSender, userId, "", content, receiver, null, readStatus, url);
+		sysMessageService.sendMessage(messageSender, userId, "", content, receiver, null, readStatus, url, group);
 		return succeed();
 	}
 }