Merge remote-tracking branch 'origin/master'

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

@@ -463,5 +463,5 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @param type
      * @return
      */
-    List<ClassGroupTeachersDto> findClassGroupByType(String musicGroupId, ClassGroupTypeEnum type);
+    List<ClassGroupTeachersDto> findClassGroupByType(@Param("musicGroupId") String musicGroupId, @Param("type") ClassGroupTypeEnum type);
 }

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

@@ -468,7 +468,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 //获取老师的默认课酬
                 String courseType = classGroupAndTeacher.getType().equals(ClassGroupTypeEnum.NORMAL) ? "SINGLE" : classGroupAndTeacher.getType().getCode();
 
-                if (musicGroup.getSettlementType().equals(SalarySettlementTypeEnum.CLASSROOM_SALARY)) {
+                if (musicGroup.isClassroomLessons()) {
                     courseType = "CLASSROOM";
                 }
 
@@ -478,6 +478,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = new TeacherDefaultMusicGroupSalary();
                     teacherDefaultMusicGroupSalary.setAssistantTeacher30MinSalary(zeroSalary);
                     teacherDefaultMusicGroupSalary.setMainTeacher30MinSalary(zeroSalary);
+                    teacherDefaultMusicGroupSalary.setMainTeacher90MinSalary(zeroSalary);
+                    teacherDefaultMusicGroupSalary.setAssistantTeacher90MinSalary(zeroSalary);
                     teacherDefaultMusicGroupSalary.setUserId(classGroupTeacherMapper.getUserId());
                     teacherSalaryByUserIdAndType.add(teacherDefaultMusicGroupSalary);
                 }

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

@@ -119,6 +119,9 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
     public boolean classGroupTeacherMapperUpdate(List<ClassGroupTeacherMapper> classGroupTeacherMapperList) throws Exception {
         Date date = new Date();
 
+        List<Integer> teacherUserIds = classGroupTeacherMapperList.stream().map(teacher -> teacher.getUserId()).collect(Collectors.toList());
+        List<TeacherDefaultMusicGroupSalary> byTeacher = teacherDefaultMusicGroupSalaryDao.findByTeacher(teacherUserIds);
+
         List<ClassGroupTeacherSalary> classGroupTeacherSalaryList = new ArrayList<>();
         List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaryList = new ArrayList<>();
 

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

@@ -150,7 +150,7 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
 
         List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailDao.findUserApplyOrder(studentRegistration.getUserId(), DealStatusEnum.WAIT_PAY);
         for (StudentPaymentOrderDetail orderDetail : orderDetails) {
-            if (orderDetail.getGoodsIdList() == null || orderDetail.getGoodsIdList().isEmpty()) continue;
+            if (orderDetail == null || orderDetail.getGoodsIdList() == null || orderDetail.getGoodsIdList().isEmpty()) continue;
             MusicGroupSubjectGoodsGroup musicGroupSubjectGoodsGroup = new MusicGroupSubjectGoodsGroup();
             if (orderDetail.getType().equals(OrderDetailTypeEnum.MUSICAL)) {
                 musicGroupSubjectGoodsGroup.setName("乐器");
@@ -169,13 +169,10 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
         }
 
         //获取声部（科目）下其他商品
-        List<Goods> otherGoods = goodsService.findTypeGoods("OTHER");
-
         MusicGroupSubjectGoodsAndInfoDto musicGroupSubjectGoodsAndInfo = new MusicGroupSubjectGoodsAndInfoDto();
         musicGroupSubjectGoodsAndInfo.setMusicGroupSubjectPlan(musicOneSubjectClassPlan);
         musicGroupSubjectGoodsAndInfo.setCourseScheduleInfo(courseForm);
         musicGroupSubjectGoodsAndInfo.setMusicGroupSubjectGoodsGroupList(goodsGroups);
-        musicGroupSubjectGoodsAndInfo.setOtherGoods(otherGoods);
         return musicGroupSubjectGoodsAndInfo;
     }
 

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

@@ -229,11 +229,12 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 
 		Map<Integer,String> sendArgs=new HashMap<>();
 		sendArgs.put(courseSchedule.getActualTeacherId(),courseSchedule.getActualTeacherId() + "");
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		//发送消息至老师
 		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
 				MessageTypeEnum.TEACHER_PUSH_STUDENT_LEAVE,
 				sendArgs,
-				null,0,"1",courseSchedule.getName());
+				null,0,"1",courseSchedule.getName(),DateUtil.getDate(courseSchedule.getClassDate()),sysUser.getUsername());
 		return true;
 	}
 

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

@@ -524,7 +524,7 @@
     <select id="countStudyNum" resultType="java.util.Map">
         SELECT cgsm.class_group_id_ 'key',COUNT(cgsm.user_id_) 'value' FROM class_group_student_mapper cgsm
         LEFT JOIN student_registration sr ON (sr.user_id_ = cgsm.user_id_ AND sr.music_group_id_ = cgsm.music_group_id_)
-        WHERE FIND_IN_SET(cgsm.class_group_id_,#{classGroupIds}) AND cgsm.status_='NORMAL' AND
+        WHERE FIND_IN_SET(cgsm.class_group_id_,#{classGroupIds}) AND cgsm.status_ != 'QUIT' AND
         FIND_IN_SET(sr.music_group_status_,'NORMAL,LEAVE') GROUP BY cgsm.class_group_id_
     </select>
 
@@ -536,20 +536,20 @@
 
     <sql id="queryMusicGroupCourseScheduleSql">
         <where>
-            cg.del_flag_ = 0
+            cg.del_flag_ = 0 AND cgtm.teacher_role_ = 'BISHOP'
             <if test="classScheduleType != null">
                 AND cs.type_ = #{classScheduleType}
             </if>
             <if test="classScheduleStatus != null">
                 AND cs.status_ = #{classScheduleStatus}
             </if>
-            <if test="startTime != null and startTime != ''">
+            <if test="startTime != null">
                 AND cs.class_date_ &gt;= #{startTime}
             </if>
-            <if test="endTime != null and endTime != ''">
+            <if test="endTime != null">
                 AND cs.class_date_ &lt;= #{endTime}
             </if>
-            <if test="musicGroupId != null and musicGroupId != ''">
+            <if test="musicGroupId != null">
                 AND cg.music_group_id_ = #{musicGroupId}
             </if>
         </where>
@@ -571,7 +571,7 @@
     </resultMap>
     <select id="queryMusicGroupCourseSchedule" resultMap="MusicGroupCourseScheduleDto">
         SELECT cs.id_ course_schedule_id_,cs.class_date_,cs.start_class_time_,cs.end_class_time_,cs.class_group_id_,
-        cs.type_ course_schedule_type_,cs.status_ course_schedule_status_,cs.name_ course_schedule_name_,
+        cs.type_ course_schedule_type_,cs.status_ course_schedule_status_,cg.name_ course_schedule_name_,
         IF(cgr.class_group_id_ IS NULL,cs.class_group_id_,cgr.class_group_id_) mix_class_group_id_,
         IF(ISNULL(ta.sign_in_status_),3,ta.sign_in_status_) sign_in_status_,
         IF(ISNULL(ta.sign_out_status_),3,ta.sign_out_status_) sign_out_status_
@@ -579,6 +579,7 @@
         LEFT JOIN class_group cg ON cg.id_ = cs.class_group_id_
         LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
         LEFT JOIN class_group_relation cgr ON cgr.sub_class_group_id_ = cs.class_group_id_
+        LEFT JOIN class_group_teacher_mapper cgtm ON cgtm.class_group_id_ = cs.class_group_id_ AND ta.teacher_id_ = cgtm.user_id_
         <include refid="queryMusicGroupCourseScheduleSql"/>
         ORDER BY cs.class_date_ DESC,cs.start_class_time_ DESC
         <include refid="global.limit"/>
@@ -588,6 +589,8 @@
         SELECT COUNT(cs.id_)
         FROM course_schedule cs
         LEFT JOIN class_group cg ON cg.id_ = cs.class_group_id_
+        LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
+        LEFT JOIN class_group_teacher_mapper cgtm ON cgtm.class_group_id_ = cs.class_group_id_ AND ta.teacher_id_ = cgtm.user_id_
         <include refid="queryMusicGroupCourseScheduleSql"/>
     </select>
 

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

@@ -113,7 +113,7 @@
 	                current_class_times_ = #{item.currentClassTimes},
 	            </if>
         	</set>
-	        where id = ${item.id}
+	        where id_ = ${item.id}
 	    </foreach>      
 	</update>
 

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

@@ -320,10 +320,12 @@
         LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cssp.course_schedule_id_ AND sa.user_id_ = cssp.user_id_
         LEFT JOIN class_group cg ON cg.id_ = sa.class_group_id_
         <include refid="studentPaymentSql"/>
+        ORDER BY cs.class_date_,cs.start_class_time_ DESC
         <include refid="global.limit"/>
     </select>
     <sql id="studentPaymentSql">
         <where>
+            cs.id_ IS NOT NULL
             <if test="classGroupType != null">
                 AND cs.type_ = #{classGroupType}
             </if>

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

@@ -303,7 +303,7 @@
         LEFT JOIN teacher_attendance ta ON cs.id_ = ta.course_schedule_id_
         LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
         <include refid="queryCloses"/>
-        ORDER BY cs.class_date_ DESC,cs.start_class_time_ DESC
+        ORDER BY cs.class_date_,cs.start_class_time_ DESC
         <include refid="global.limit"/>
     </select>
 
@@ -372,6 +372,7 @@
 
     <sql id="queryTeacherAttendanceSql">
         <where>
+            CONCAT(cs.class_date_,' ',cs.start_class_time_) &lt; NOW() AND cgtm.teacher_role_ = 'BISHOP'
             <if test="startTime != null and startTime != ''">
                 AND cs.class_date_ &gt;= #{startTime}
             </if>
@@ -401,8 +402,9 @@
         FROM course_schedule cs
         LEFT JOIN teacher_attendance ta ON cs.id_ = ta.course_schedule_id_
         LEFT JOIN sys_user su ON su.id_ = ta.teacher_id_
+        LEFT JOIN class_group_teacher_mapper cgtm ON cgtm.class_group_id_ = cs.class_group_id_ AND ta.teacher_id_ = cgtm.user_id_
         <include refid="queryTeacherAttendanceSql"/>
-        ORDER BY cs.class_date_ DESC
+        ORDER BY cs.class_date_ DESC,cs.start_class_time_ DESC
         <include refid="global.limit"/>
     </select>
     <select id="countTeacherAttendance" resultType="java.lang.Integer">
@@ -410,6 +412,7 @@
         FROM course_schedule cs
         LEFT JOIN teacher_attendance ta ON cs.id_ = ta.course_schedule_id_
         LEFT JOIN sys_user su ON su.id_ = ta.teacher_id_
+        LEFT JOIN class_group_teacher_mapper cgtm ON cgtm.class_group_id_ = cs.class_group_id_ AND ta.teacher_id_ = cgtm.user_id_
         <include refid="queryTeacherAttendanceSql"/>
     </select>
     <select id="queryNameById" resultType="java.lang.String">
@@ -478,6 +481,7 @@
 
     <sql id="queryCloses">
         <where>
+            CONCAT(cs.class_date_,' ',cs.start_class_time_) &lt; NOW()
             <if test="teacherId != null">
                 AND cs.actual_teacher_id_ = #{teacherId}
             </if>

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

@@ -231,8 +231,8 @@ public class ClassGroupController extends BaseController {
             @ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "string"),
             @ApiImplicitParam(name = "type", value = "班级类型", required = true, dataType = "string"),
     })
-    public HttpResponseResult classGroupAndTeacher(String musicGroup, ClassGroupTypeEnum type) throws Exception {
-        return succeed(classGroupService.getClassGroupAndTeacherByType(musicGroup,type));
+    public HttpResponseResult classGroupAndTeacher(String musicGroupId, ClassGroupTypeEnum type) throws Exception {
+        return succeed(classGroupService.getClassGroupAndTeacherByType(musicGroupId,type));
     }
 
 }