Merge remote-tracking branch 'origin/saas' into saas

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

@@ -108,16 +108,6 @@ public class IndexErrDataRecordServiceImpl extends BaseServiceImpl<Long, IndexEr
 				indexErrDataRecordDao.batchInsert(errInspectionItemPlans);
 			}
 
-			//回访任务未完成
-//			List<IndexErrDataRecord> errStudentVisits = indexErrDataRecordDao.queryStudentVisit(date, null);
-//			if(!CollectionUtils.isEmpty(errStudentVisits)) {
-//				errStudentVisits.forEach(e -> {
-//					e.setDataType(IndexErrorType.STUDENT_VISIT);
-//					e.setGenerateTime(dt);
-//				});
-//				indexErrDataRecordDao.batchInsert(errStudentVisits);
-//			}
-
 			//课程考勤异常
 			List<IndexErrDataRecord> errStudentAttendances = indexErrDataRecordDao.getAttendanceError(date, null);
 			if(!CollectionUtils.isEmpty(errStudentAttendances)) {

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

@@ -237,77 +237,6 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 						"STUDENT",memberName,pushMemberRenewAgain);
 			}
 		}
-
-		/*Date date = new Date();
-		//会员结束前15天自动创建乐团续费（默认提前15天）
-		String autoCreateMemberRenew = sysTenantConfigService.getTenantConfigValue(SysConfigService.AUTO_CREATE_MEMBER_RENEW,tenantId);
-		if(StringUtils.isNotEmpty(autoCreateMemberRenew)){
-			Map<String,String> studentMusicMap = MapUtil.convertMybatisMap(studentRegistrationDao.queryAutoCreateStudentMap(autoCreateMemberRenew, tenantId));
-			if(studentMusicMap.size() > 0){
-				for (String musicGroupId : studentMusicMap.keySet()) {
-					MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
-					MemberFeeSetting memberFee = memberFeeSettingDao.findByRankIdAndOrganId(musicGroup.getOrganId(), memberRankSetting.getId());
-					if(memberFee == null){
-						Organization organization = organizationDao.get(musicGroup.getOrganId());
-						logger.error("自动创建缴费项目失败，{} 分部会员收费标准未配置",organization.getName());
-						continue;
-					}
-					//创建缴费项目
-					MusicGroupPaymentCalenderDto musicGroupPaymentCalenderDto = new MusicGroupPaymentCalenderDto();
-					musicGroupPaymentCalenderDto.setMusicGroupId(musicGroupId);
-					musicGroupPaymentCalenderDto.setMemberValidDate(6);
-					musicGroupPaymentCalenderDto.setMemo("系统自动创建缴费项目");
-					musicGroupPaymentCalenderDto.setMemberRankSettingId(memberRankSetting.getId());
-					musicGroupPaymentCalenderDto.setPayUserType(MusicGroupPaymentCalender.PayUserType.STUDENT);
-					musicGroupPaymentCalenderDto.setPaymentType(MusicGroupPaymentCalender.PaymentType.MUSIC_RENEW);
-					musicGroupPaymentCalenderDto.setPaymentPattern(1);
-					musicGroupPaymentCalenderDto.setMemberPaymentAmount(memberFee.getGroupPurchaseHalfYearFee().setScale(0, BigDecimal.ROUND_HALF_UP));
-					musicGroupPaymentCalenderDto.setAutoCreate(true);
-					musicGroupPaymentCalenderDto.setIsGiveMusicNetwork(false);
-					List<MusicGroupPaymentCalenderDto.MusicGroupPaymentDateRange> musicGroupPaymentDateRangeList = new ArrayList<>();
-					MusicGroupPaymentCalenderDto.MusicGroupPaymentDateRange range = new MusicGroupPaymentCalenderDto().new MusicGroupPaymentDateRange();
-					range.setStartPaymentDate(date);
-					range.setDeadlinePaymentDate(DateUtil.addMonths(date,1));
-					musicGroupPaymentDateRangeList.add(range);
-					musicGroupPaymentCalenderDto.setMusicGroupPaymentDateRangeList(musicGroupPaymentDateRangeList);
-					String batchNo = "";
-					try {
-						batchNo = musicGroupPaymentCalenderService.create(musicGroupPaymentCalenderDto);
-					}catch (Exception e){
-						logger.error("{} 乐团自动创建缴费项目失败，失败原因:{}",musicGroup.getName(),e.getMessage());
-						continue;
-					}
-					MusicGroupPaymentCalender calender = musicGroupPaymentCalenderService.findByBatchNo(batchNo).get(0);
-					Set<Integer> userIdList = Arrays.stream(studentMusicMap.get(musicGroupId).split(",")).map(Integer::new).collect(Collectors.toSet());
-					musicGroupPaymentCalenderDetailService.batchAdd(calender.getId(),userIdList,musicGroup,true);
-					Map<Integer, String> studentPhoneMap = MapUtil.convertMybatisMap(teacherDao.queryPhoneByIds(studentMusicMap.get(musicGroupId)));
-					Map<Integer,String> userMap = new HashMap<>(userIdList.size());
-					Map<Integer,String> userMap1 = new HashMap<>(userIdList.size());
-					for (Integer studentId : userIdList) {
-						userMap.put(studentId,studentPhoneMap.get(studentId));
-						userMap1.put(studentId,studentId.toString());
-					}
-					String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
-					String pushUrl = baseApiUrl + "/#/musicGroupRenew?calenderId=" + calender.getId() + "&id=" + musicGroupId;
-					String sortUrl = HttpUtil.getSortUrl(pushUrl);
-					sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS,
-							MessageTypeEnum.SMS_AUTO_STUDENT_MEMBER_RENEW_MESSAGE,
-							userMap,
-							null,
-							0,
-							sortUrl,
-							null,memberName,autoCreateMemberRenew,sortUrl);
-
-					sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
-							MessageTypeEnum.PUSH_AUTO_STUDENT_MEMBER_RENEW_MESSAGE,
-							userMap1,
-							null,
-							0,
-							"4?" + pushUrl,
-							"STUDENT",memberName,autoCreateMemberRenew);
-				}
-			}
-		}*/
 	}
 
 	private MusicGroupSchoolTermCourseDetail getCourseDetail(MusicGroupSchoolTermCourseDetail courseDetail){

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

@@ -156,7 +156,7 @@
 		SELECT
 			id_ data_id_,
 		    organ_id_,
-		    user_id_ deal_user_id_
+		    user_id_ deal_user_id_,tenant_id_
 		FROM
 			inspection_item_plan
 		WHERE
@@ -176,7 +176,7 @@
 		SELECT
 			iip.id_ data_id_,
 			iip.organ_id_,
-			iip.user_id_ deal_user_id_
+			iip.user_id_ deal_user_id_,iip.tenant_id_
 		FROM inspection_item_plan iip
 		WHERE iip.status_ = 0 AND iip.memo_ = ''
 			AND DATE_FORMAT(iip.plan_start_,'%Y-%m-%d') < DATE_FORMAT(NOW(),'%Y-%m-%d')
@@ -217,6 +217,7 @@
 	<select id="getAttendanceError" resultMap="IndexErrDataRecord">
 		SELECT
 			DISTINCT cs.id_ data_id_,
+			cs.tenant_id_,
 			cs.organ_id_,
 			CASE cs.group_type_ WHEN 'MUSIC' THEN mg.educational_teacher_id_ WHEN 'VIP' THEN vg.educational_teacher_id_ WHEN 'PRACTICE' THEN pg.educational_teacher_id_ END deal_user_id_
 		FROM course_schedule cs
@@ -247,6 +248,7 @@
 		SELECT
 			cs.id_ data_id_,
 			cs.organ_id_,
+			cs.tenant_id_,
 			CASE cs.group_type_ WHEN 'MUSIC' THEN mg.educational_teacher_id_ WHEN 'VIP' THEN vg.educational_teacher_id_ WHEN 'PRACTICE' THEN pg.educational_teacher_id_ END deal_user_id_
 		FROM course_schedule cs
 			LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_

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

@@ -435,7 +435,7 @@
                pg.user_id_              teacher_id_,
                cg.id_                   class_group_id_,
                pg.single_class_minutes_ total_minutes_,
-               pg.subject_id_
+               pg.subject_id_,pg.tenant_id_
         FROM practice_group pg
                  LEFT JOIN class_group cg on pg.id_ = cg.music_group_id_ AND cg.group_type_ = 'PRACTICE'
          WHERE pg.group_status_ IN ('NORMAL','FINISH') AND cg.group_type_ = 'PRACTICE'

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

@@ -267,7 +267,7 @@
         g.image_ goods_img_,
         spo.create_time_ start_time_,
         DATE_ADD(spo.create_time_, INTERVAL 1 YEAR) end_time_,
-        spo.id_ order_id_
+        spo.id_ order_id_,spod.tenant_id_
         FROM student_payment_order_detail spod
         LEFT JOIN student_payment_order spo ON spo.id_ = spod.payment_order_id_
         LEFT JOIN student_payment_order_detail spod2 ON spod2.payment_order_id_ = spo.id_

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

@@ -11,6 +11,7 @@ import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.UploadReturnBean;
 import com.ym.mec.common.redis.service.RedisCache;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.im.ImFeignService;
 import com.ym.mec.util.date.DateUtil;
 import com.yonge.log.service.HistoryMessageService;
@@ -346,7 +347,9 @@ public class TaskController extends BaseController {
 	//学生服务信息统计
 	@GetMapping("/exercisesSituationStatistics")
 	public void exercisesSituationStatistics(String monday){
+		TenantContextHolder.setTenantId(1);
 		studentServeService.exercisesSituationStatistics2(monday,null,1);
+		TenantContextHolder.clearTenantId();
 //		studentServeService.exercisesSituationStatistics2(null,new ArrayList<>(Arrays.asList(1095257)));
 //		studentServeService.exercisesSituationStatistics(null);
 	}
@@ -387,7 +390,9 @@ public class TaskController extends BaseController {
 		List<TenantInfo> tenantInfos = tenantInfoService.list(new QueryWrapper<TenantInfo>().eq("state_",1));
 		if(tenantInfos != null && tenantInfos.size() > 0){
 			for (TenantInfo tenantInfo : tenantInfos) {
+				TenantContextHolder.setTenantId(tenantInfo.getId());
 				operatingReportService.statistics(tenantInfo.getId());
+				TenantContextHolder.clearTenantId();
 			}
 		}
 	}
@@ -407,7 +412,9 @@ public class TaskController extends BaseController {
 		List<TenantInfo> tenantInfos = tenantInfoService.list(new QueryWrapper<TenantInfo>().eq("state_",1));
 		if(tenantInfos != null && tenantInfos.size() > 0){
 			for (TenantInfo tenantInfo : tenantInfos) {
+				TenantContextHolder.setTenantId(tenantInfo.getId());
 				indexBaseMonthDataService.indexBaseDataTask(tenantInfo.getId(), month, dataTypeSet);
+				TenantContextHolder.clearTenantId();
 			}
 		}
 	}
@@ -454,7 +461,9 @@ public class TaskController extends BaseController {
 		List<TenantInfo> tenantInfos = tenantInfoService.list(new QueryWrapper<TenantInfo>().eq("state_",1));
 		if(tenantInfos != null && tenantInfos.size() > 0){
 			for (TenantInfo tenantInfo : tenantInfos) {
+				TenantContextHolder.setTenantId(tenantInfo.getId());
 				courseScheduleTeacherSalaryService.salaryMarkNew(startDay,tenantInfo.getId());
+				TenantContextHolder.clearTenantId();
 			}
 		}
 	}
@@ -480,10 +489,10 @@ public class TaskController extends BaseController {
 	@ApiOperation("每天10点推送排课、续费提醒")
 	@GetMapping(value = "/musicSchoolTermPush")
 	public void musicSchoolTermPush() {
-//		Object o = redisCache.get("musicSchoolTermPush");
-//		if(o != null){
-//			return;
-//		}
+		Object o = redisCache.get("musicSchoolTermPush");
+		if(o != null){
+			return;
+		}
 		List<TenantInfo> tenantInfos = tenantInfoService.list(new QueryWrapper<TenantInfo>().eq("state_",1));
 		if(tenantInfos != null && tenantInfos.size() > 0){
 			for (TenantInfo tenantInfo : tenantInfos) {