Merge remote-tracking branch 'origin/master'

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

@@ -24,7 +24,6 @@ import com.ym.mec.im.ImFeignService;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
-
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -2020,16 +2019,16 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 	private void stopVipPush(Long vipGroupId,String vipGroupName){
 		String refundPeriod = sysConfigDao.findConfigValue(SysConfigService.REFUND_PERIOD);
-		Map<Integer,String> map = MapUtil.convertMybatisMap(classGroupStudentMapperDao.queryStudentIdMap(vipGroupId));
-		if(map != null && map.size() > 0){
+		Map<Integer,String> map1 = MapUtil.convertMybatisMap(classGroupStudentMapperDao.queryStudentIdMap(vipGroupId));
+		if(map1 != null && map1.size() > 0){
 			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,MessageTypeEnum.PUSH_STUDENT_VIP_STOP,
-					map,null,0,null,"STUDENT",vipGroupName,refundPeriod);
+					map1,null,0,null,"STUDENT",vipGroupName,refundPeriod);
 		}
 //		老师推送消息
-		map = MapUtil.convertMybatisMap(classGroupStudentMapperDao.queryTeacherIdMap(vipGroupId));
-		if(map != null && map.size() > 0){
+		Map<Integer,String> map2 = MapUtil.convertMybatisMap(classGroupStudentMapperDao.queryTeacherIdMap(vipGroupId));
+		if(map2 != null && map2.size() > 0){
 			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,MessageTypeEnum.PUSH_TEACHER_VIP_STOP,
-					map,null,0,null,"TEACHER",vipGroupName);
+					map2,null,0,null,"TEACHER",vipGroupName);
 		}
 	}
 

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

@@ -398,6 +398,7 @@
             <foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
                 #{courseScheduleId}
             </foreach>
+        AND (update_time_!='1970-01-01 00:00:00' OR update_time_ IS NULL)
         GROUP BY
             course_schedule_id_
     </select>