管乐迷需求迭代

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

@@ -131,6 +131,26 @@ public class StudentManageListDto {
 
     private String practiceTeacherName;
 
+    private Integer courseTeacher;
+
+    private String courseTeacherName;
+
+    public Integer getCourseTeacher() {
+        return courseTeacher;
+    }
+
+    public void setCourseTeacher(Integer courseTeacher) {
+        this.courseTeacher = courseTeacher;
+    }
+
+    public String getCourseTeacherName() {
+        return courseTeacherName;
+    }
+
+    public void setCourseTeacherName(String courseTeacherName) {
+        this.courseTeacherName = courseTeacherName;
+    }
+
     public String getNormalTeacherName() {
         return normalTeacherName;
     }

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

@@ -133,6 +133,7 @@ public class StudentManageServiceImpl implements StudentManageService {
             dataList = studentManageDao.findStudentsByOrganId(params);
             Set<Integer> userIds = dataList.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
             List<Integer> organIds = dataList.stream().map(e -> e.getOrganId()).distinct().collect(Collectors.toList());
+            List<Integer> courseTeacherIds = dataList.stream().map(e -> e.getCourseTeacher()).distinct().collect(Collectors.toList());
             organIds.removeAll(Collections.singleton(null));
             List<SysUserCashAccount> accounts = sysUserCashAccountDao.findByUserIds(userIds);
             Map<Integer, Organization> organMap = null;
@@ -147,9 +148,13 @@ public class StudentManageServiceImpl implements StudentManageService {
             List<String> subjectIds = dataList.stream().map(e -> e.getSubjectIdList()).distinct().collect(Collectors.toList());
             subjectIds.removeAll(Collections.singleton(null));
             Map<String, String> subjectMap = new HashMap<>();
+            Map<Integer, String> courseTeacherNameMap = new HashMap<>();
             if(!CollectionUtils.isEmpty(subjectIds)){
                 subjectMap = sysConfigService.getMap("subject", "id_", "name_", subjectIds, queryInfo.getTenantId(), String.class, String.class);
             }
+            if(!CollectionUtils.isEmpty(courseTeacherIds)){
+                courseTeacherNameMap = sysConfigService.getMap("sys_user", "id_", "real_name_", courseTeacherIds, queryInfo.getTenantId(), Integer.class, String.class);
+            }
             List<Integer> cooIds = dataList.stream().map(e -> e.getCooperationOrganId()).distinct().collect(Collectors.toList());
             cooIds.removeAll(Collections.singleton(null));
             Map<Integer, String> cooMap = new HashMap<>();
@@ -177,6 +182,7 @@ public class StudentManageServiceImpl implements StudentManageService {
                         dto.setBalance(account.getBalance());
                     }
                 }
+                dto.setCourseTeacherName(courseTeacherNameMap.get(dto.getCourseTeacher()));
                 dto.setSubjectName(subjectMap.get(dto.getSubjectIdList()));
                 dto.setCooperationOrganName(cooMap.get(dto.getCooperationOrganId()));
                 if(!CollectionUtils.isEmpty(mappersMap)){

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

@@ -79,6 +79,7 @@
         <result column="record_user_id_" property="recordUserId"/>
         <result column="ext_subject_ids_" property="extSubjectIds"/>
         <result column="repair_flag_" property="repairFlag"/>
+        <result column="course_teacher_" property="courseTeacher"/>
     </resultMap>
 
     <update id="updateUser" parameterType="com.ym.mec.auth.api.entity.SysUser">
@@ -153,7 +154,7 @@
         s.membership_end_time_,CASE WHEN sut.user_id_ IS NULL THEN 0 ELSE 1 END is_signed_contract_,
         s.cooperation_organ_id_,s.activity_course_detail_,s.experience_membership_end_time_,
         DATEDIFF(s.experience_membership_end_time_,NOW()) experience_membership_day_,DATEDIFF(s.membership_end_time_,NOW()) membership_day_,
-        smcr.user_id_ record_user_id_
+        smcr.user_id_ record_user_id_,s.course_teacher_
 		FROM `student` s LEFT JOIN `sys_user` su ON s.`user_id_` = su.`id_`
 		LEFT JOIN sys_user_tsign sut ON sut.user_id_ = s.user_id_
         LEFT JOIN (SELECT DISTINCT user_id_ FROM sys_music_compare_record) smcr ON smcr.user_id_ = s.user_id_

mec-teacher/src/main/java/com/ym/mec/teacher/controller/StudentController.java

@@ -55,6 +55,7 @@ public class StudentController extends BaseController {
     @RequestMapping("/findStudentAttendance")
     public HttpResponseResult<List<StudentAttendance>> findStudentAttendance(StudentAttendanceQueryInfo queryInfo){
         //按考勤状态和回访状态排序
+        queryInfo.setStartDateOfCourse(DateUtil.getFirstDayOfMonth(DateUtil.addMonths(new Date(), -1)));
         queryInfo.setOrderFlag(true);
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);