update

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

@@ -334,4 +334,12 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	 * @return
 	 */
 	List<Long> querySettlementScheduleId(String courseScheduleIds);
+
+	/**
+	 * 该用户是不是这个群组的老师
+	 * @param groupId
+	 * @param userId
+	 * @return
+	 */
+    Boolean isTeacher(@Param("groupId") Integer groupId, @Param("userId") Integer userId);
 }

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

@@ -12,7 +12,9 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
 
@@ -404,4 +406,11 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      */
     PageInfo endFindClassGroups(EndCourseScheduleQueryInfo queryInfo);
 
+    /**
+     *
+     * @param groupId
+     * @param userId
+     * @return
+     */
+    Map<String,Object> getUserInfoWithUserId(Integer groupId, Integer userId);
 }

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

@@ -740,10 +740,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                         e.setTitle("教务老师");
                     }else if(musicGroup.getDirectorUserId() != null && Integer.parseInt(e.getId()) == musicGroup.getDirectorUserId()){
                         e.setTitle("乐队指导");
-                    }else {
+                    }else if(courseScheduleTeacherSalaryDao.isTeacher(groupId,Integer.parseInt(e.getId()))){
                         e.setTitle("指导老师");
                     }
-                }else {
+                }else if(courseScheduleTeacherSalaryDao.isTeacher(groupId,Integer.parseInt(e.getId()))){
                     e.setTitle("指导老师");
                 }
             });
@@ -2495,6 +2495,39 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         return pageInfo;
     }
 
+    @Override
+    public Map<String, Object> getUserInfoWithUserId(Integer groupId, Integer userId) {
+        MusicGroup musicGroup = musicGroupDao.findByClassId(groupId);
+        SysUser user = teacherDao.getUser(userId);
+        Map<String,Object> map = new HashMap<>(4);
+        if(musicGroup != null){
+            if(musicGroup.getTeamTeacherId() != null && userId.equals(musicGroup.getTeamTeacherId())){
+                map.put("name",user.getRealName() + "(运营主管)");
+            }else if(musicGroup.getEducationalTeacherId() != null && userId.equals(musicGroup.getEducationalTeacherId())){
+                map.put("name",user.getRealName() + "(教务老师)");
+            }else if(musicGroup.getDirectorUserId() != null && userId.equals(musicGroup.getDirectorUserId())){
+                map.put("name",user.getRealName() + "(乐队指导)");
+            }else if(courseScheduleTeacherSalaryDao.isTeacher(groupId,userId)){
+                map.put("name",user.getRealName() + "(指导老师)");
+            }else {
+                map.put("name",user.getUsername());
+            }
+        }else {
+            if(courseScheduleTeacherSalaryDao.isTeacher(groupId,userId)){
+                map.put("name",user.getRealName() + "(指导老师)");
+            }else {
+                map.put("name",user.getUsername());
+            }
+        }
+        map.put("userId",userId);
+        if(StringUtils.isEmpty(user.getAvatar())){
+            map.put("avatar","https://daya-online.oss-cn-beijing.aliyuncs.com/201912/RkoZBNq.jpeg");
+        }else {
+            map.put("avatar",user.getAvatar());
+        }
+        return map;
+    }
+
 
     @Override
     public ClassGroup findGroupById(Integer groupId) {

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

@@ -229,7 +229,7 @@
 		<if test="days!=null">
 			AND cs.class_date_ &lt;= DATE_FORMAT(DATE_ADD( NOW( ), INTERVAL - #{days} DAY ),'%Y-%m-%d')
 		</if>
-		AND cs.type_='VIP'
+		AND cs.type_ IN ('VIP','PRACTICE')
 		AND csts.settlement_time_ IS NULL
 		AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
     </select>
@@ -602,4 +602,8 @@
 		WHERE cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth} AND cs.`del_flag_` != 1 AND cs.group_type_ = 'PRACTICE' AND ts.settlement_time_ IS NOT NULL
 		GROUP BY ts.id_,ta.id_
 	</select>
+    <select id="isTeacher" resultType="java.lang.Boolean">
+		SELECT COUNT(DISTINCT csts.user_id_) FROM class_group_teacher_mapper csts
+		WHERE csts.class_group_id_ = #{groupId} AND csts.user_id_ = #{userId}
+	</select>
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -72,7 +72,6 @@ public class StudentManageController extends BaseController {
         return succeed();
     }
 
-
     @ApiOperation(value = "根据群编号，获取群组所有成员基本信息")
     @GetMapping("classGroup/findGroupUsers")
     public Object findGroupUsers(Integer groupId) {
@@ -82,6 +81,15 @@ public class StudentManageController extends BaseController {
         return succeed(classGroupService.findGroupUsers(groupId));
     }
 
+    @ApiOperation(value = "根据群编号，获取用户群名片")
+    @GetMapping("classGroup/getUserInfoWithUserId")
+    public Object getUserInfoWithUserId(Integer groupId,Integer userId) {
+        if (groupId == null || userId == null) {
+            return failed("参数校验错误");
+        }
+        return succeed(classGroupService.getUserInfoWithUserId(groupId,userId));
+    }
+
     @ApiOperation(value = "获取用户账户信息")
     @GetMapping("userCashAccount/get")
     public Object add() {

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

@@ -68,4 +68,13 @@ public class ClassGroupController extends BaseController {
         return succeed(courseScheduleEvaluateService.addStudyReport(courseScheduleEvaluate));
     }
 
+    @ApiOperation(value = "根据群编号，获取用户群名片")
+    @GetMapping("/getUserInfoWithUserId")
+    public Object getUserInfoWithUserId(Integer groupId,Integer userId) {
+        if (groupId == null || userId == null) {
+            return failed("参数校验错误");
+        }
+        return succeed(classGroupService.getUserInfoWithUserId(groupId,userId));
+    }
+
 }

mec-web/src/main/java/com/ym/mec/web/controller/education/ImController.java

@@ -67,4 +67,13 @@ public class ImController extends BaseController {
         return succeed(classGroupService.findGroupUsers(groupId));
     }
 
+    @ApiOperation(value = "根据群编号，获取用户群名片")
+    @GetMapping("/getUserInfoWithUserId")
+    public Object getUserInfoWithUserId(Integer groupId,Integer userId) {
+        if (groupId == null || userId == null) {
+            return failed("参数校验错误");
+        }
+        return succeed(classGroupService.getUserInfoWithUserId(groupId,userId));
+    }
+
 }