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

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

@@ -36,7 +36,7 @@ public interface CourseScheduleEvaluateDao extends BaseDAO<Long, CourseScheduleE
      * @author Joburgess
      * @date 2020/2/28
      */
-    List<CourseScheduleEvaluate> findExpiredDateBeforeReport(@Param("expiredDate") Date expiredDate,@Param("tenantId") Integer tenantId);
+    List<CourseScheduleEvaluate> findExpiredDateBeforeReport(@Param("expiredDate") Date expiredDate);
 
     /**
      * 根据课程组id获取报告列表

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

@@ -13,7 +13,7 @@ public interface TeacherCourseStatisticsDao extends BaseDAO<Long, TeacherCourseS
     int deleteByMonth(@Param("date") Date date);
 
     List<TeacherCourseStatistics> findUserByWarringSalary(@Param("startDate") Date startDate,
-                                                          @Param("endDate") Date endDate,@Param("tenantId") Integer tenantId);
+                                                          @Param("endDate") Date endDate);
 
     List<TeacherCourseStatistics> findUserCourseSalaryByUserIds(@Param("userIds") List<Integer> userIds,
                                                                 @Param("startDate") Date startDate,

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/VipGroupPayInfoDto.java

@@ -16,6 +16,16 @@ public class VipGroupPayInfoDto {
 
     private BigDecimal balance;
 
+    private Integer tenantId;
+
+    public Integer getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(Integer tenantId) {
+        this.tenantId = tenantId;
+    }
+
     public Integer getVipGroupId() {
         return vipGroupId;
     }

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

@@ -1,20 +1,15 @@
 package com.ym.mec.biz.service;
 
-import com.ym.mec.biz.dal.dto.TeacherAbnormalAttendanceInfoDto;
 import com.ym.mec.biz.dal.dto.TeacherAttendanceComplaintsDto;
 import com.ym.mec.biz.dal.dto.TeacherAttendanceDetailDto;
 import com.ym.mec.biz.dal.dto.TeacherSignOutDto;
 import com.ym.mec.biz.dal.entity.TeacherAttendance;
-import com.ym.mec.biz.dal.enums.SignStatusEnum;
 import com.ym.mec.biz.dal.enums.UpdateAttendanceEnum;
 import com.ym.mec.biz.dal.page.TeacherAttendanceComplaintsQueryInfo;
 import com.ym.mec.biz.dal.page.TeacherCloseQueryInfo;
 import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 
-import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 public interface TeacherAttendanceService extends BaseService<Long, TeacherAttendance> {
@@ -40,8 +35,6 @@ public interface TeacherAttendanceService extends BaseService<Long, TeacherAtten
 									Integer userId,
 									 String deviceNum);
 
-
-
 	/**
 	 * @describe 教师线上课签到
 	 * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
@@ -73,37 +66,6 @@ public interface TeacherAttendanceService extends BaseService<Long, TeacherAtten
 	boolean pushNoSignOutMessage(Integer tenantId);
 
 	/**
-	 * @describe 根据日期获取部门下异常签到的课程记录
-	 * @author Joburgess
-	 * @date 2019/10/25
-	 * @param organId: 部门编号
-	 * @param date: 日期
-	 * @param signInStatus: 签到状态：0异常，1正常，null未签到
-	 * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherAbnormalAttendanceInfoDto>
-	 */
-	List<TeacherAbnormalAttendanceInfoDto> findTeacherAbnormalSignInCourseScheduleRecord(Integer organId,Date date,Integer signInStatus);
-
-	/**
-	 * @describe 根据月份获取部门下异常签到的日期
-	 * @author Joburgess
-	 * @date 2019/10/25
-	 * @param organId: 部门编号
-	 * @param date: 日期
-	 * @return java.util.List<java.util.Date>
-	 */
-	List<Date> findTeacherAbnormalSignInDates(Integer organId, Date date);
-
-	/**
-	 * @describe 根据日期获取对应签到状态的课程数量
-	 * @author Joburgess
-	 * @date 2019/10/25
-	 * @param organId: 部门编号
-	 * @param date: 日期
-	 * @return int
-	 */
-	Map countTeacherAbnormalSignInClassTimes(Integer organId, Date date);
-
-	/**
 	 * @describe 获取签到详情
 	 * @author Joburgess
 	 * @date 2019/12/25
@@ -129,15 +91,6 @@ public interface TeacherAttendanceService extends BaseService<Long, TeacherAtten
 	 */
 	void updateTeacherAttendance(TeacherAttendance teacherAttendance);
 
-
-	/**
-	 * 获取教师签到信息
-	 * @param courseId
-	 * @param teacherId
-	 * @return
-	 */
-	TeacherAttendance findByTeacherAttendanceInfo(Long courseId, Integer teacherId);
-
 	/**
 	 * 获取教师签到详情
 	 * @param courseScheduleId

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

@@ -106,6 +106,8 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 				employeeDao.insert(employee);
 				//新增用户角色
 				employeeDao.batchAddEmployeeRole(user.getId(),employee.getRoleIds(), tenantId);
+				//新增用户职位
+				employeePositionService.batchAddPosition(employee.getId(),employee.getPositionIds(), tenantId);
 				employee.setUserType(user.getUserType() + ",SYSTEM");
 				teacherDao.updateUser(employee);
 				return;

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

@@ -15,6 +15,7 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.collection.MapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,13 +54,14 @@ public class MusicEnlightenmentQuestionnaireServiceImpl extends BaseServiceImpl<
 			throw new BizException("问卷信息错误");
 		}
 		// 查询乐团状态
-		MusicGroup musicGroup = musicGroupDao.getLocked(musicGroupId);
+		MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
 		if (musicGroup == null) {
 			throw new BizException("乐团信息错误");
 		}
 		if (musicGroup.getStatus() != MusicGroupStatusEnum.PRE_APPLY) {
 			throw new BizException("乐团当前状态不能预报名");
 		}
+		TenantContextHolder.setTenantId(musicGroup.getTenantId());
 		enlightenmentQuestionnaire.setTenantId(musicGroup.getTenantId());
 		enlightenmentQuestionnaire.setOrganId(musicGroup.getOrganId());
 		// 根据手机号检测学员是否存在，存在就更新，不存在插入
@@ -72,6 +74,7 @@ public class MusicEnlightenmentQuestionnaireServiceImpl extends BaseServiceImpl<
 			enlightenmentQuestionnaire.setId(musicEnlightenmentQuestionnaire.getId());
 			musicEnlightenmentQuestionnaireDao.update(enlightenmentQuestionnaire);
 		}
+		TenantContextHolder.clearTenantId();
 	}
 
 	@Override

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

@@ -62,8 +62,6 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 	@Autowired
 	private MusicGroupPaymentStudentCourseDetailDao musicGroupPaymentStudentCourseDetailDao;
 	@Autowired
-	private MusicGroupPaymentCalenderStudentDetailDao musicGroupPaymentCalenderStudentDetailDao;
-	@Autowired
 	private MusicGroupDao musicGroupDao;
 	@Autowired
 	private SysConfigDao sysConfigDao;

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

@@ -332,7 +332,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (originRegistration != null) {
             throw new BizException("您已预报名成功，请勿重复提交资料");
         }
-
+        TenantContextHolder.setTenantId(musicGroup.getTenantId());
         studentPreRegistration.setTenantId(musicGroup.getTenantId());
         studentPreRegistration.setOrganId(musicGroup.getOrganId());
         //保存学员信息
@@ -365,6 +365,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         studentPreRegistrationDao.insert(studentPreRegistration);
         // 添加成员
         imGroupMemberService.join(Long.parseLong(musicGroupId), user.getId(), null, false);
+        TenantContextHolder.clearTenantId();
         return true;
     }
 

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

@@ -4017,6 +4017,10 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         return BaseController.succeed();
     }
 
+    public static void main(String[] args) {
+
+    }
+
     @Override
     public void pushStudyReport(Date expiredDate, String pushType) {
         if (Objects.isNull(expiredDate)) {
@@ -4026,9 +4030,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         if (StringUtils.isBlank(pushType)) {
             throw new BizException("请指定推送类型：JIGUANG、SMS、ALL");
         }
-        Integer tenantId = TenantContextHolder.getTenantId();
-
-        List<CourseScheduleEvaluate> reports = courseScheduleEvaluateDao.findExpiredDateBeforeReport(expiredDate, tenantId);
+        List<CourseScheduleEvaluate> reports = courseScheduleEvaluateDao.findExpiredDateBeforeReport(expiredDate);
 
         if (CollectionUtils.isEmpty(reports)) {
             return;
@@ -4041,36 +4043,28 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             if (Objects.isNull(userFreePracticeGroup)) {
                 continue;
             }
-//            ClassGroup classGroup = classGroupDao.findByMusicGroupAndType(userFreePracticeGroup.getId().toString(), GroupType.PRACTICE.getCode());
-//
-//            CourseScheduleEvaluate courseScheduleEvaluate = courseScheduleEvaluateDao.findByClassGroupId(classGroup.getId());
-//            if(Objects.isNull(courseScheduleEvaluate)){
-//                continue;
-//            }
-
-            String pushUrl = baseApiUrl + "/#/reportDetail?classGroupId=" + report.getClassGroupId();
-            String smsUrl = baseApiUrl + "/#/transfer?url=" + baseApiUrl + "&hash=reportDetail&classGroupId=" + report.getClassGroupId();
-
+            StringBuffer pushUrl = new StringBuffer(baseApiUrl);
+            StringBuffer smsUrl = new StringBuffer(baseApiUrl);
             if (report.getVersion().equals(2)) {
-                pushUrl = baseApiUrl + "/#/reportDetailNew?id=" + report.getId() + "&classGroupId=" + report.getClassGroupId();
-                smsUrl = baseApiUrl + "/#/transfer?url=" + baseApiUrl + "&hash=reportDetailNew&id=" + report.getId() + "&classGroupId=" + report.getClassGroupId();
+                pushUrl.append("/#/reportDetailNew?id=").append(report.getId()).append("&classGroupId=").append(report.getClassGroupId());
+                smsUrl.append("/#/transfer?url=").append(baseApiUrl).append("&hash=reportDetailNew&id=").append(report.getId()).append("&classGroupId=").append(report.getClassGroupId());
+            }else {
+                pushUrl.append("/#/reportDetail?classGroupId=").append(report.getClassGroupId());
+                smsUrl.append("/#/transfer?url=").append(baseApiUrl).append("&hash=reportDetail&classGroupId=").append(report.getClassGroupId());
             }
-
-//            SysUser student = sysUserFeignService.queryUserById(userFreePracticeGroup.getStudentId());
             SysUser student = teacherDao.getUser(userFreePracticeGroup.getStudentId());
-
             if (pushType.equals("ALL") || pushType.equals("JIGUANG")) {
                 Map<Integer, String> userMap = new HashMap<>();
                 userMap.put(userFreePracticeGroup.getStudentId(), userFreePracticeGroup.getStudentId().toString());
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_PUSH_PRACTICE_COMPLETED_STUDY_REPORT,
-                        userMap, null, 0, "5?" + pushUrl, "STUDENT", pushUrl);
+                        userMap, null, 0, pushUrl.insert(0,"5?").toString(), "STUDENT", pushUrl.toString());
             }
 
             if (pushType.equals("ALL") || pushType.equals("SMS")) {
                 Map<Integer, String> userPhoneMap = new HashMap<>();
                 userPhoneMap.put(userFreePracticeGroup.getStudentId(), student.getPhone());
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_PUSH_PRACTICE_COMPLETED_STUDY_REPORT,
-                        userPhoneMap, null, 0, null, "STUDENT", HttpUtil.getSortUrl(smsUrl));
+                        userPhoneMap, null, 0, null, "STUDENT", HttpUtil.getSortUrl(smsUrl.toString()));
             }
             report.setIsPushed(1);
             courseScheduleEvaluateDao.update(report);
@@ -5083,6 +5077,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             throw new BizException("未找到此课程");
         }
         VipGroupPayInfoDto vipGroupPayInfo = new VipGroupPayInfoDto();
+        vipGroupPayInfo.setTenantId(practiceGroup.getTenantId());
         vipGroupPayInfo.setVipGroupId(practiceGroupId.intValue());
         vipGroupPayInfo.setViipGroupName(practiceGroup.getName());
         vipGroupPayInfo.setPrice(practiceGroup.getTotalPrice());

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

@@ -136,11 +136,10 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     @Override
     @Transactional(rollbackFor = Exception.class)
 	public boolean register(StudentPreRegistration studentPreRegistration) {
-    	
-    	Date date = new Date();
+        TenantContextHolder.setTenantId(studentPreRegistration.getTenantId());
+        Date date = new Date();
     	// 判断用户是否存在
-        SysUser user = sysUserFeignService.queryUserByMobile(studentPreRegistration.getPhone());
-        
+        SysUser user = teacherDao.getUserWithPhone(studentPreRegistration.getPhone());
         Integer userId = null;
         
         if(user != null && user.getId() != null){
@@ -183,7 +182,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         student.setRemake(studentPreRegistration.getRemake());
         student.setUnitName(studentPreRegistration.getUnitName());
         studentDao.insert(student);
-        
+        TenantContextHolder.clearTenantId();
         return true;
 	}
 

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

@@ -632,24 +632,6 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 	}
 
 	@Override
-	public List<TeacherAbnormalAttendanceInfoDto> findTeacherAbnormalSignInCourseScheduleRecord(Integer organId, Date date, Integer signInStatus) {
-		return teacherAttendanceDao.findTeacherAbnormalSignInCourseScheduleRecord(organId,date,signInStatus);
-	}
-
-	@Override
-	public List<Date> findTeacherAbnormalSignInDates(Integer organId, Date date) {
-		return teacherAttendanceDao.findTeacherAbnormalSignInDates(organId,date);
-	}
-
-	@Override
-	public Map countTeacherAbnormalSignInClassTimes(Integer organId, Date date) {
-		Map<String,Integer> result=new HashMap<>();
-		result.put("abnormalSignInNum",teacherAttendanceDao.countTeacherAbnormalSignInClassTimes(organId,date,YesOrNoEnum.NO.getCode()));
-		result.put("noSignInNum",teacherAttendanceDao.countTeacherAbnormalSignInClassTimes(organId,date,null));
-		return result;
-	}
-
-	@Override
 	public TeacherSignOutDto getTeacherSignDetail(Integer courseScheduleId, Integer userId) {
 		if(Objects.isNull(courseScheduleId)){
 			throw new BizException("请指定课程");
@@ -739,11 +721,6 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 	}
 
 	@Override
-	public TeacherAttendance findByTeacherAttendanceInfo(Long courseId, Integer teacherId) {
-		return teacherAttendanceDao.findByTeacherAttendanceInfo(teacherId.longValue(),courseId);
-	}
-
-	@Override
 	public TeacherAttendanceDetailDto getTeacherPersonalAttendanceDetail(Integer courseScheduleId) {
 		TeacherAttendance teacherAttendance = teacherAttendanceDao.getMainTeacherAttendance(courseScheduleId);
 		CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleId.longValue());

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

@@ -59,7 +59,7 @@ public class TeacherCourseStatisticsServiceImpl extends BaseServiceImpl<Long, Te
         Date nextMonthDate = new Date();
         Date startDate = DateUtil.getFirstDayOfMonth(nextMonthDate);
         Date endDate = DateUtil.getLastDayOfMonth(nextMonthDate);
-        List<TeacherCourseStatistics> teacherCourseStatisticsList = teacherCourseStatisticsDao.findUserByWarringSalary(startDate, endDate, TenantContextHolder.getTenantId());
+        List<TeacherCourseStatistics> teacherCourseStatisticsList = teacherCourseStatisticsDao.findUserByWarringSalary(startDate, endDate);
         if (teacherCourseStatisticsList.size() == 0) {
             return;
         }

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

@@ -4627,6 +4627,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             throw new BizException("未找到此课程");
         }
         VipGroupPayInfoDto vipGroupPayInfo = new VipGroupPayInfoDto();
+        vipGroupPayInfo.setTenantId(vipGroup.getTenantId());
         vipGroupPayInfo.setVipGroupId(vipGroup.getId().intValue());
         vipGroupPayInfo.setViipGroupName(vipGroup.getName());
         vipGroupPayInfo.setPrice(vipGroup.getTotalPrice());

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

@@ -194,7 +194,6 @@
         SELECT *
         FROM course_schedule_evaluate
         WHERE status_ = 1
-          and tenant_id_ = #{tenantId}
           AND create_time_ <= #{expiredDate}
           AND (is_pushed_ = 0 OR is_pushed_ IS NULL)
     </select>

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

@@ -339,7 +339,7 @@
 
 	<sql id="queryErrInspectionDataCondition">
 		<where>
-			tenant_id_ = #{tenantId}
+			irdr.tenant_id_ = #{tenantId}
 			<if test="searchType != null and searchType != ''">
 				<if test="searchType == 'MUSIC_PATROL_ITEM'">
 					and irdr.data_type_ = 'MUSIC_PATROL_ITEM'

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

@@ -140,7 +140,7 @@
           AND spo.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
           AND spo.type_ = 'APPLY'
           AND sr.music_group_id_ = #{musicGroupId}
-          AND sr.music_group_status_ != 'QUIT'
+          AND sr.music_group_status_ != 'QUIT' AND spod.id_ IS NOT NULL
     </select>
 
     <!-- 查询订单详情 -->
@@ -346,6 +346,6 @@
         SELECT c.id_ FROM (SELECT payment_order_id_ id_ FROM music_group_payment_calender_detail
         WHERE music_group_payment_calender_id_ = #{calenderId} AND payment_order_id_ IS NOT NULL
         UNION
-        SELECT id_ FROM student_payment_order WHERE calender_id_ = #{calenderId} AND status_ = 'SUCCESS')c)
+        SELECT id_ FROM student_payment_order WHERE calender_id_ = #{calenderId} AND status_ = 'SUCCESS')c) AND spod.id_ IS NOT NULL
     </select>
 </mapper>

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

@@ -49,6 +49,7 @@
         <result column="phone_" jdbcType="VARCHAR" property="phone"/>
         <result column="organ_name_" jdbcType="VARCHAR" property="organName"/>
         <result column="month_str_" jdbcType="VARCHAR" property="monthStr"/>
+        <result column="tenant_id_" jdbcType="INTEGER" property="tenantId"/>
     </resultMap>
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.TeacherCourseStatistics" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
@@ -86,7 +87,7 @@
     <!-- 查找下月排课小于基准课酬的老师-->
     <select id="findUserByWarringSalary" resultMap="TeacherCourseStatistics1"><![CDATA[
         SELECT ctt.expect_total_salary_, t.id_ user_id_,t.organ_id_,t.subject_id_ subject_id_list_,
-               ctt.average_class_minutes_
+               ctt.average_class_minutes_,t.tenant_id_
         FROM teacher t
          LEFT JOIN sys_user su ON t.id_=su.id_
          LEFT JOIN (
@@ -102,7 +103,7 @@
             GROUP BY
                 csts.user_id_
         ) ctt ON ctt.user_id_=t.id_
-        WHERE su.del_flag_ != 1 AND su.lock_flag_!=1 and t.tenant_id_ = #{tenantId}
+        WHERE su.del_flag_ != 1 AND su.lock_flag_!=1
           AND t.demission_date_ IS NULL
           AND t.organ_id_ IS NOT NULL
         ]]>

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

@@ -177,7 +177,8 @@ public class TaskController extends BaseController {
 	@GetMapping("/vipGroupAwardedMonthlyRewards")
 	// vip课月度奖励
 	public void vipGroupAwardedMonthlyRewards() {
-		vipGroupService.awardedMonthlyRewards();
+		//问过测试了，这个功能没有用过
+//		vipGroupService.awardedMonthlyRewards();
 	}
 
 	@GetMapping("/vipGroupTeacherSalarySettlement")