update

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

@@ -82,7 +82,7 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
     @Transactional(rollbackFor = Exception.class)
     public boolean delClassGroupStudent(Integer userId, Integer classGroupId, Boolean quitMusicGroup) {
         ClassGroup classGroup = classGroupService.get(classGroupId);
-        Integer studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(classGroupId);
+//        Integer studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(classGroupId);
         /*if (!quitMusicGroup && classGroup.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE) && studentNum <= 3) {
             throw new BizException(classGroup.getName()+"（网络基础训练课班级）人数不能少于3,请调整");
         }*/

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

@@ -2200,9 +2200,10 @@
 		GROUP BY cop.organ_id_
 	</select>
 	<select id="indexImportCoop" resultType="com.ym.mec.biz.dal.dto.DecimalMapDto">
-		select co.id_ id,co.name_ name,SUM(spo.expect_amount_) amount from cooperation_organ co
-		left join student_payment_order spo ON co.id_ = spo.music_group_id_ AND spo.type_ = 'SCHOOL'
-		AND spo.group_type_ = 'OUTORDER' AND spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+		select co.id_ id,co.name_ name,spo.expect_amount_ amount from cooperation_organ co
+		left join (select music_group_id_,SUM(expect_amount_) expect_amount_ from student_payment_order where type_ = 'SCHOOL'
+		AND group_type_ = 'OUTORDER' AND status_ = 'SUCCESS' AND DATE_FORMAT(pay_time_,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+		group by music_group_id_) spo ON co.id_ = spo.music_group_id_
 		where co.is_enable_ AND co.del_flag_ = 0
 		<if test="organIds != null and organIds.size > 0">
 			AND co.organ_id_ IN

mec-common/common-core/src/main/java/com/ym/mec/common/controller/BaseController.java

@@ -129,7 +129,7 @@ public class BaseController {
 
 	public String dingTalkRobotsSecurityParam() throws Exception{
 		Long timestamp = System.currentTimeMillis();
-		String secret = "SEC36b17ac2f4e201f962042fb05f4b6b827719bcf9b6bb7b672e61f99c752eb693";
+		String secret = "SEC5e3b73acccb12fc2a2a7d36d416c1967c66adb99a75dce24ecc324b50e528a29";
 		String stringToSign = timestamp + "\n" + secret;
 		Mac mac = Mac.getInstance("HmacSHA256");
 		mac.init(new SecretKeySpec(secret.getBytes("UTF-8"), "HmacSHA256"));