Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -49,74 +49,77 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
      * @param teacherIds
      * @return
      */
-    List<Map<Integer,Integer>> getTeacherOperatingStudentsNum(@Param("teacherIds") String teacherIds);
+    List<Map<Integer, Integer>> getTeacherOperatingStudentsNum(@Param("teacherIds") String teacherIds);
 
     List<String> getStudentNames(@Param("studentIds") List<Integer> studentIds);
 
     List<SimpleUserDto> getStudentsWithOrgan(Map<String, Object> params);
+
     int countStudentsWithOrgan(Map<String, Object> params);
 
     /**
      * 根据类型批量获取老师转化
+     *
      * @param teacherIds
      * @param groupType
      * @return
      */
-    List<Map<Integer,Integer>> getBuyNums(@Param("teacherIds") String teacherIds, @Param("groupType") GroupType groupType);
+    List<Map<Integer, Integer>> getBuyNums(@Param("teacherIds") String teacherIds, @Param("groupType") GroupType groupType);
 
-     /**
+    /**
      * 根据同事存在vip和网管的转化
+     *
      * @param teacherIds
      * @return
      */
-    List<Map<Integer,Integer>> getPracticeAndVipNums(@Param("teacherIds") String teacherIds);
+    List<Map<Integer, Integer>> getPracticeAndVipNums(@Param("teacherIds") String teacherIds);
 
     /**
+     * @return java.util.List<com.ym.mec.biz.dal.entity.Student>
      * @describe 获取服务学员列表
      * @author Joburgess
      * @date 2020.04.29
-     * @return java.util.List<com.ym.mec.biz.dal.entity.Student>
      */
 
     List<Student> getServiceStudents();
 
     /**
+     * @return java.util.List<java.lang.Integer>
      * @describe 获取被服务学员id列表
      * @author Joburgess
      * @date 2020.06.04
-     * @return java.util.List<java.lang.Integer>
      */
     List<Integer> getServeStudentIds();
 
     List<StudentServeCourseDto> getServeStudentCourseStartTimes(@Param("monday") String monday);
 
     /**
+     * @param monday:
+     * @return java.util.List<com.ym.mec.biz.dal.dto.StudentServeDto>
      * @describe 查询被服务学员信息
      * @author Joburgess
      * @date 2020.05.27
-     * @param monday:
-     * @return java.util.List<com.ym.mec.biz.dal.dto.StudentServeDto>
      */
     List<StudentServeDto> getBeServiceStudents(@Param("monday") String monday,
-                                               @Param("courseExpireDate")Date courseExpireDate);
+                                               @Param("courseExpireDate") Date courseExpireDate);
 
 
     List<StudentServeDto> getBeServiceStudentsInfoWithStudents(@Param("monday") String monday,
-                                               @Param("courseExpireDate")Date courseExpireDate,
-                                               @Param("studentIds") List<Integer> studentIds);
+                                                               @Param("courseExpireDate") Date courseExpireDate,
+                                                               @Param("studentIds") List<Integer> studentIds);
 
     List<StudentServeDto> getBeServiceStudentsInfoWithStudentsForHistory(@Param("monday") String monday,
-                                                               @Param("courseExpireDate")Date courseExpireDate,
-                                                               @Param("studentIds") List<Integer> studentIds);
+                                                                         @Param("courseExpireDate") Date courseExpireDate,
+                                                                         @Param("studentIds") List<Integer> studentIds);
 
     /**
+     * @param studentId:    学生编号
+     * @param serviceTag:   服务指标
+     * @param operatingTag: 运营指标
+     * @return int
      * @describe 更新指定学员的服务指标或运营指标
      * @author Joburgess
      * @date 2020.05.28
-     * @param studentId: 学生编号
-     * @param serviceTag: 服务指标
-     * @param operatingTag: 运营指标
-     * @return int
      */
     int updateStudentServiceOrOperatingTag(@Param("studentId") Integer studentId,
                                            @Param("studentIds") List<Integer> studentIds,
@@ -124,20 +127,28 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
                                            @Param("operatingTag") Integer operatingTag);
 
     /**
+     * @param studentId:  学生编号
+     * @param serviceTag: 服务指标
+     * @return int
      * @describe 更新指定学员的服务指标
      * @author Joburgess
      * @date 2020.05.28
-     * @param studentId: 学生编号
-     * @param serviceTag: 服务指标
-     * @return int
      */
     int updateStudentServiceTag(@Param("studentId") Integer studentId,
-                                           @Param("studentIds") List<Integer> studentIds,
-                                           @Param("serviceTag") Integer serviceTag);
+                                @Param("studentIds") List<Integer> studentIds,
+                                @Param("serviceTag") Integer serviceTag);
 
     /**
      * 修改学员的指导老师
+     *
      * @param teacherId
      */
     void batchUpdateAdviser(@Param("teacherId") Integer teacherId, @Param("studentIds") String studentIds);
+
+    /**
+     * 获取学生的老师
+     * @param studentIds
+     * @return
+     */
+    List<Student> getStudentTeacher(@Param("studentIds") List<Integer> studentIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Student.java

@@ -30,6 +30,8 @@ public class Student {
 	/**  */
 	private java.util.Date updateTime;
 
+	private String teacherName;
+
 	public Student(Integer userId, String subjectIdList) {
 		this.userId = userId;
 		this.subjectIdList = subjectIdList;
@@ -118,4 +120,12 @@ public class Student {
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);
 	}
+
+	public String getTeacherName() {
+		return teacherName;
+	}
+
+	public void setTeacherName(String teacherName) {
+		this.teacherName = teacherName;
+	}
 }

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

@@ -13,6 +13,7 @@
         <result column="operating_tag_" property="operatingTag"/>
         <result column="operating_temp_tag_" property="operatingTempTag"/>
         <result column="teacher_id_" property="teacherId"/>
+        <result column="teacher_name_" property="teacherName"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
     </resultMap>
@@ -510,4 +511,13 @@
                 AND (su.username_ LIKE CONCAT('%', #{search}, '%') OR su.phone_ LIKE CONCAT('%', #{search}, '%'))
             </if>
     </select>
+
+    <select id="getStudentTeacher" resultMap="Student">
+        SELECT s.user_id_,t.real_name_ teacher_name_ FROM student s
+        LEFT JOIN sys_user t ON t.id_ = s.teacher_id_
+        WHERE s.user_id_ IN
+        <foreach collection="studentIds" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 </mapper>

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

@@ -96,6 +96,8 @@ public class ExportController extends BaseController {
     private StudentPaymentRouteOrderDao studentPaymentRouteOrderDao;
     @Autowired
     private StudentPaymentOrderDao studentPaymentOrderDao;
+    @Autowired
+    private StudentDao studentDao;
 
     @Autowired
     private TeacherService teacherService;
@@ -2156,9 +2158,11 @@ public class ExportController extends BaseController {
         }
         List<Long> vipGroupIds = orders.stream().filter(e -> e.getGroupType().equals(GroupType.VIP)).map(OrderByTypeExportDto::getMusicGroupId).collect(Collectors.toList());
         List<Long> practiceGroupIds = orders.stream().filter(e -> e.getGroupType().equals(GroupType.PRACTICE)).map(OrderByTypeExportDto::getMusicGroupId).collect(Collectors.toList());
+        List<Integer> studentIds = orders.stream().filter(e -> e.getGroupType().equals(GroupType.SPORADIC)).map(OrderByTypeExportDto::getStudentId).collect(Collectors.toList());
 
         List<VipBuyResultDto> vipGroupTeachers = new ArrayList<>();
         List<PracticeCourseDto> practiceGroupsTeacher = new ArrayList<>();
+        List<Student> studentTeachers = new ArrayList<>();
         if (vipGroupIds.size() > 0) {
             vipGroupTeachers = vipGroupDao.getGroupTeachers(vipGroupIds);
         }
@@ -2166,18 +2170,29 @@ public class ExportController extends BaseController {
         if (practiceGroupIds.size() > 0) {
             practiceGroupsTeacher = practiceGroupDao.getPracticeGroupByIds(practiceGroupIds);
         }
+        if(studentIds.size() > 0){
+            studentTeachers = studentDao.getStudentTeacher(studentIds);
+        }
 
         for (OrderByTypeExportDto order : orders) {
             for (VipBuyResultDto vipGroupTeacher : vipGroupTeachers) {
                 if (order.getGroupType().equals(GroupType.VIP) && order.getMusicGroupId().equals(vipGroupTeacher.getVipGroupId().longValue())) {
                     order.setTeacherName(vipGroupTeacher.getTeacherName());
                     order.setEduTeacherName(vipGroupTeacher.getEduTeacherName());
+                    break;
                 }
             }
             for (PracticeCourseDto practiceCourseDto : practiceGroupsTeacher) {
                 if (order.getGroupType().equals(GroupType.PRACTICE) && order.getMusicGroupId().equals(practiceCourseDto.getId())) {
                     order.setTeacherName(practiceCourseDto.getTeacherName());
                     order.setEduTeacherName(practiceCourseDto.getEduTeacherName());
+                    break;
+                }
+            }
+            for (Student studentTeacher : studentTeachers) {
+                if (order.getGroupType().equals(GroupType.SPORADIC) && studentTeacher.getUserId().equals(order.getStudentId())) {
+                    order.setTeacherName(studentTeacher.getTeacherName());
+                    break;
                 }
             }