Merge branch 'adapay_new'

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

@@ -47,6 +47,10 @@ public class TeacherAttendancesDto {
     @ApiModelProperty(value = "签退状态(1正常签到，0异常签到) ",required = false)
     private SignOutStatusEnum signOutStatus;
 
+    private String signInLongitudeLatitude;
+
+    private String signOutLongitudeLatitude;
+
     /** 备注 */
     @ApiModelProperty(value = "备注",required = false)
     private String remark;

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.ExportTeacherSalaryDto;
+import com.ym.mec.biz.dal.dto.TeacherAttendanceDto;
 import com.ym.mec.biz.dal.dto.TeacherCourseSalaryDetail4WebDto;
 import com.ym.mec.biz.dal.dto.TeacherSalaryDto;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
@@ -167,4 +168,12 @@ public interface CourseScheduleTeacherSalaryService extends BaseService<Long, Co
      */
     List<CourseScheduleTeacherSalary> createTeacherCourseSalary(CourseSchedule courseSchedule, List<Integer> teacherIds);
 
+    /**
+     * @describe 获取指定课程上的教师信息
+     * @author Joburgess
+     * @date 2020/11/17 0017
+     * @param courseScheduleId:
+     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherAttendanceDto>
+     */
+    List<TeacherAttendanceDto> getCourseTeachers(Long courseScheduleId);
 }

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

@@ -1272,4 +1272,10 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             }
         }
     }
+
+    @Override
+    public List<TeacherAttendanceDto> getCourseTeachers(Long courseScheduleId) {
+        List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = courseScheduleTeacherSalaryDao.findByCourseSchedule(courseScheduleId);
+        return null;
+    }
 }

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

@@ -508,7 +508,9 @@ public class StudentManageServiceImpl implements StudentManageService {
         if (sysUser1 != null && !userId.equals(sysUser1.getId())) {
             throw new BizException("手机号已被占用");
         }
-        teacherDao.updateUser(student);
+        sysUserFeignService.updateSysUser(student);
+
+        student.setUserId(student.getId());
         student.setOperatingTag(student.getOperatingTag());
         student.setOperatingTempTag(0);
         student.setServiceTag(student.getServiceTag() == 0 ? 2 : 1);

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

@@ -148,8 +148,8 @@
     </update>
 
     <select id="findStudentsByOrganId" resultMap="studentManageListDto">
-        SELECT o.`name_` organ_name_,s.`user_id_` ,su.`username_` ,su.`phone_` parents_phone_,su.`real_name_` ,su.`gender_` , 
-		tu.`username_` teacher_name_,s.`service_tag_` ,s.`operating_tag_` , suca.`course_balance_` ,sub.`name_` music_group_subject_ 
+        SELECT o.`name_` organ_name_,s.`user_id_` ,su.`username_` ,su.`phone_` parents_phone_,su.`real_name_` ,su.`gender_` , su.organ_id_,
+		tu.`username_` teacher_name_,s.`service_tag_` ,s.`operating_tag_` , suca.`course_balance_` ,sub.`name_` music_group_subject_ ,su.birthdate_,s.subject_id_list_,s.teacher_id_
 		FROM `student` s LEFT JOIN `sys_user` su on s.`user_id_` = su.`id_`
 		LEFT JOIN `organization` o on o.`id_` = su.`organ_id_`
 		LEFT JOIN `sys_user` tu on tu.`id_` = s.`teacher_id_` 
@@ -795,7 +795,7 @@
     </select>
     
     <select id="queryStudentRemianCourse" resultMap="StudentListCourseDto">
-    	SELECT cssp.`user_id_` ,count(cssp.`id_`) remainCourseNum,sum(case when cs.`group_type_` = 'PRACTICE' then 1 else 0 end) remainPracticeNum  
+    	SELECT cssp.`user_id_` userId,count(cssp.`id_`) remainCourseNum,sum(case when cs.`group_type_` = 'PRACTICE' then 1 else 0 end) remainPracticeNum  
     	FROM `course_schedule_student_payment` cssp LEFT JOIN `course_schedule` cs on cssp.`course_schedule_id_` = cs.`id_`
 		WHERE cs.`status_` = 'NOT_START' AND cssp.`user_id_` IN
         <foreach collection="userIds" item="userId" open="(" close=")" separator=",">