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

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

@@ -475,5 +475,5 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @param organId
      * @return
      */
-    List<TeacherBasicDto> findByFlowOrganRangeTeachers(String organId);
+    List<TeacherBasicDto> findByFlowOrganRangeTeachers(@Param("organId") String organId);
 }

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

@@ -57,9 +57,31 @@ public class ExportStudentAttendanceDto {
     @ApiModelProperty(value = "教务老师名称", required = true)
     private String educationalTeacherName;
 
+    @ApiModelProperty(value = "授课老师编号", required = true)
+    private Integer actualTeacherId;
+
+    @ApiModelProperty(value = "授课老师名称", required = true)
+    private String actualTeacherName;
+
     @ApiModelProperty(value = "学员考勤状态", required = true)
     private StudentAttendanceStatusEnum studentAttendanceStatus;
 
+    public Integer getActualTeacherId() {
+        return actualTeacherId;
+    }
+
+    public void setActualTeacherId(Integer actualTeacherId) {
+        this.actualTeacherId = actualTeacherId;
+    }
+
+    public String getActualTeacherName() {
+        return actualTeacherName;
+    }
+
+    public void setActualTeacherName(String actualTeacherName) {
+        this.actualTeacherName = actualTeacherName;
+    }
+
     public String getOrganId() {
         return organId;
     }

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

@@ -85,7 +85,7 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
      * @param organId
      * @return
      */
-    List<TeacherBasicDto> findTeachers(@Param("organId") String organId);
+    List<TeacherBasicDto> findTeachers(String organId);
 
     /**
      * @describe 根据科目获取部门下的教师
@@ -94,7 +94,7 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
      * @param subjectId: 科目编号
      * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
      */
-    List<Teacher> findOrganTeacherBySubject(@Param("subjectId") Integer subjectId);
+    List<Teacher> findOrganTeacherBySubject(Integer subjectId);
 
     /**
      * 获取教师上课结算列表

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

@@ -521,6 +521,8 @@
         <result property="courseScheduleName" column="course_schedule_name_"/>
         <result property="educationalTeacherId" column="educational_teacher_id_"/>
         <result property="educationalTeacherName" column="educational_teacher_name_"/>
+        <result property="actualTeacherId" column="actual_teacher_id_"/>
+        <result property="actualTeacherName" column="actual_teacher_name_"/>
         <result property="endClassTime" column="end_class_time_"/>
         <result property="groupId" column="music_group_id_"/>
         <result property="groupName" column="music_group_name_"/>
@@ -563,6 +565,7 @@
         MAX(cs.class_date_) class_date_,MAX(cs.start_class_time_) start_class_time_,MAX(cs.end_class_time_) end_class_time_,
         MAX(su2.real_name_) guide_teacher_name_,MAX(st.teacher_id_) guide_teacher_id_
         ,MAX(su1.real_name_) educational_teacher_name_,MAX(mg.educational_teacher_id_) educational_teacher_id_,MAX(cs.group_type_) group_type_,
+        MAX(cs.actual_teacher_id_) actual_teacher_id_,MAX(su3.real_name_) actual_teacher_name_,
         CASE WHEN MAX(sa.id_) IS NULL THEN 'TRUANT' ELSE MAX(sa.status_) END attendance_status_
         FROM course_schedule_student_payment cssp
         LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
@@ -581,6 +584,7 @@
         LEFT JOIN student st ON st.user_id_ = cssp.user_id_
         LEFT JOIN sys_user su ON su.id_ = cssp.user_id_
         LEFT JOIN sys_user su2 ON su2.id_ = st.teacher_id_
+        LEFT JOIN sys_user su3 ON su3.id_ = cs.actual_teacher_id_
         <include refid="exportStudentAttendancesQueryPageSql"/>
         GROUP BY cssp.id_
         ORDER BY cssp.music_group_id_ DESC,cssp.id_ DESC

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

@@ -764,7 +764,10 @@
     <select id="findByFlowOrganRangeTeachers" resultMap="TeacherBasicDto">
         SELECT su.id_,su.username_,su.real_name_,t.organ_id_ FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
-        WHERE su.del_flag_ = 0 AND (INTE_ARRAY(#{organId},t.flow_organ_range_) OR FIND_IN_SET(t.organ_id_,#{organId}))
+        WHERE su.del_flag_ = 0
+        <if test="organId != null and organId != ''">
+            AND (INTE_ARRAY(#{organId},t.flow_organ_range_) OR FIND_IN_SET(t.organ_id_,#{organId}))
+        </if>
     </select>
 
     <select id="findByTeacherIds" resultMap="Teacher">

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

@@ -137,10 +137,11 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部编号", "分部名称", "课程组类型", "课程组编号", "课程组名称", "学员姓名",
-                    "学员编号", "课程编号", "课程名称", "上课日期", "上课开始时间", "上课结束时间", "指导老师名称", "指导老师编号", "教务老师名称", "教务老师编号", "学员考勤状态"}, new String[]{
+                    "学员编号", "课程编号", "课程名称", "上课日期", "上课开始时间", "上课结束时间",
+                    "指导老师名称", "指导老师编号", "教务老师名称", "教务老师编号", "授课老师名称", "授课老师编号", "学员考勤状态"}, new String[]{
                     "organId", "organName", "groupType.desc", "groupId", "groupName", "username",
                     "userId", "courseScheduleId", "courseScheduleName", "classDate", "startClassTime", "endClassTime", "guideTeacherName", "guideTeacherId"
-                    , "educationalTeacherName", "educationalTeacherId", "studentAttendanceStatus.msg"}, rows);
+                    , "educationalTeacherName", "educationalTeacherId", "actualTeacherName", "actualTeacherId", "studentAttendanceStatus.msg"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=studentAttendance-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();