Merge remote-tracking branch 'origin/master'

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

@@ -158,14 +158,14 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
      * @param organIds
      * @return
      */
-    int getAttendanceError(@Param("organIds") String organIds,@Param("startTime") String startTime);
+    int getAttendanceError(@Param("organIds") Set<Integer> organIds,@Param("startTime") String startTime);
 
     /**
      * 获取旷课考勤
      * @param organIds
      * @return
      */
-    int getNoAttendance(@Param("organIds") String organIds, @Param("startTime") String startTime);
+    int getNoAttendance(@Param("organIds") Set<Integer> organIds, @Param("startTime") String startTime);
 
     /**
      * 获取老师离职申请数

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

@@ -35,7 +35,7 @@ public interface ImUserFriendService extends BaseService<Long, ImUserFriend> {
 	 * @param nickname 昵称
 	 * @return
 	 */
-	boolean updateFriendNickname(Integer userId, Integer friendUserId, String nickname);
+	boolean updateFriendNickname(Integer userId, Integer friendUserId, String nickname, String memo);
 
 	/**
 	 * 根据条件查询指定用户的好友列表

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

@@ -73,7 +73,7 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 		imGroupMember.setUpdateTime(date);
 		imGroupMember.setUserId(userId);
 		if (StringUtils.isBlank(roleType)) {
-			imGroupMember.setNickname(user.getRealName());
+			imGroupMember.setNickname(user.getUsername());
 		} else {
 			imGroupMember.setNickname(user.getRealName());
 		}

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

@@ -88,13 +88,14 @@ public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend>
 	}
 
 	@Override
-	public boolean updateFriendNickname(Integer userId, Integer friendUserId, String nickname) {
+	public boolean updateFriendNickname(Integer userId, Integer friendUserId, String nickname, String memo) {
 		ImUserFriend userFriend = imUserFriendDao.query(userId, friendUserId);
 		if (userFriend == null) {
 			throw new BizException("好友不存在");
 		}
 		Date date = new Date();
 		userFriend.setFriendNickname(nickname);
+		userFriend.setMemo(memo);
 		userFriend.setUpdateTime(date);
 		imUserFriendDao.update(userFriend);
 

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

@@ -320,10 +320,10 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			three.setDesc(IndexErrorType.TEACHER_INFO.getMsg());
 			List<IndexErrInfoDto> threeChild = new ArrayList<>();
 
-			int attendanceError = indexBaseMonthDataDao.getAttendanceError(organIdsStr,startTime);
+			int attendanceError = indexBaseMonthDataDao.getAttendanceError(organIds,startTime);
 			threeChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_EXCEPTION_ATTENDANCE, IndexErrorType.TEACHER_EXCEPTION_ATTENDANCE.getMsg(), attendanceError, null));
 
-			int noAttendance = indexBaseMonthDataDao.getNoAttendance(organIdsStr,startTime);
+			int noAttendance = indexBaseMonthDataDao.getNoAttendance(organIds,startTime);
 			threeChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_NOT_A_CLASS, IndexErrorType.TEACHER_NOT_A_CLASS.getMsg(), noAttendance, null));
 
 //			int teacherLeave = indexBaseMonthDataDao.queryTeacherLeave(organIdsStr,startTime);
@@ -418,28 +418,16 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 				flag2 = true;
 			}
 		}
-		/*if(!flag2){
-			int attendanceInfo = indexBaseMonthDataDao.queryStudentAttendanceInfo(organIds, StudentAttendanceStatusEnum.TRUANT.getCode(),startTime);
-			if(attendanceInfo > 0){
-				flag2 = true;
-			}
-		}
-		if(!flag2){
-			int attendanceInfo1 = indexBaseMonthDataDao.queryStudentAttendanceInfo(organIds, StudentAttendanceStatusEnum.LEAVE.getCode(),startTime);
-			if(attendanceInfo1 > 0){
-				flag2 = true;
-			}
-		}*/
 		resultMap.put("studentInfo",flag2);
 		boolean flag3 = false;
 		if(!flag3){
-			int attendanceError = indexBaseMonthDataDao.getAttendanceError(organIdsStr,startTime);
+			int attendanceError = indexBaseMonthDataDao.getAttendanceError(organIds,startTime);
 			if(attendanceError > 0){
 				flag3 = true;
 			}
 		}
 		if(!flag3){
-			int noAttendance = indexBaseMonthDataDao.getNoAttendance(organIdsStr,startTime);
+			int noAttendance = indexBaseMonthDataDao.getNoAttendance(organIds,startTime);
 			if(noAttendance > 0){
 				flag3 = true;
 			}

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

@@ -716,8 +716,11 @@
 		AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_>='2021-02-01'
 		AND (ta.sign_in_status_ != 1 OR ta.sign_out_status_ != 1 OR sa.status_ != 'NORMAL') AND ta.dispose_content_ IS NULL
 		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
-		<if test="organIds != null and organIds != ''">
-			AND FIND_IN_SET(cs.organ_id_,#{organIds})
+		<if test="organIds!=null and organIds.size() > 0">
+			AND cs.organ_id_ IN
+			<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
+				#{organId}
+			</foreach>
 		</if>
 		GROUP BY cs.id_) c
 	</select>
@@ -728,8 +731,11 @@
 		AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_>='2021-02-01'
 		AND ta.sign_in_time_ IS NULL AND ta.sign_out_time_ IS NULL AND ta.dispose_content_ IS NULL
 		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
-		<if test="organIds != null and organIds != ''">
-			AND FIND_IN_SET(cs.organ_id_,#{organIds})
+		<if test="organIds!=null and organIds.size() > 0">
+			AND cs.organ_id_ IN
+			<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
+				#{organId}
+			</foreach>
 		</if>
 	</select>
 	<select id="queryTeacherLeave" resultType="int">

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

@@ -1,6 +1,10 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.biz.service.ImGroupMemberService;
+import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
 import java.util.Date;
@@ -38,6 +42,9 @@ public class ImGroupController extends BaseController {
 	private ImUserFriendService imUserFriendService;
 
 	@Autowired
+	private ImGroupMemberService imGroupMemberService;
+
+	@Autowired
 	private ImGroupNoticeService imGroupNoticeService;
 
 	@Autowired
@@ -85,7 +92,6 @@ public class ImGroupController extends BaseController {
 	@ApiOperation("查询群成员详情")
 	@GetMapping(value = "/queryGroupMemberDetail")
 	public Object queryGroupMemberDetail(Long imGroupId, Integer userId) {
-
 		return succeed(imGroupService.queryMember(imGroupId, userId));
 	}
 
@@ -140,4 +146,32 @@ public class ImGroupController extends BaseController {
 	public Object queryNoticeList(ImGroupNoticeQueryInfo queryInfo) {
 		return succeed(imGroupNoticeService.queryPage(queryInfo));
 	}
+
+	@ApiOperation("添加群成员")
+	@PostMapping(value = "/addGroupMember")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "imGroupId", value = "群编号", required = true, dataType = "Integer"),
+			@ApiImplicitParam(name = "roleType", value = "指导老师,乐队指导,乐团主管,运营主管,学员不传", required = true, dataType = "String"),
+			@ApiImplicitParam(name = "isAdmin", value = "是否管理员", required = true, dataType = "Boolean"),
+			@ApiImplicitParam(name = "userId", value = "用户编号", required = true, dataType = "Integer")})
+	public Object addGroupMember(Long imGroupId, Integer userId, String roleType, boolean isAdmin) {
+		return succeed(imGroupMemberService.join(imGroupId,userId,roleType,isAdmin));
+	}
+
+	@ApiOperation("退群")
+	@PostMapping(value = "/quitGroup")
+	@AuditLogAnnotation(operateName = "退群",interfaceURL = "imGroup/quitGroup")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "imGroupId", value = "群编号", required = true, dataType = "Integer"),
+			@ApiImplicitParam(name = "userId", value = "用户编号", required = true, dataType = "Integer")})
+	public Object quitGroup(Long imGroupId, Integer userId) {
+		return succeed(imGroupMemberService.quit(imGroupId,userId));
+	}
+
+	@ApiOperation("修改角色")
+	@PostMapping(value = "/updateRoleType")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "imGroupId", value = "群编号", required = true, dataType = "Integer"),
+			@ApiImplicitParam(name = "roleType", value = "指导老师,乐队指导,乐团主管,运营主管,学员不传", required = true, dataType = "String"),
+			@ApiImplicitParam(name = "userId", value = "用户编号", required = true, dataType = "Integer")})
+	public Object updateRoleType(Long imGroupId, Integer userId, String roleType) {
+		return succeed(imGroupMemberService.updateRoleType(imGroupId,userId,roleType));
+	}
 }

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

@@ -0,0 +1,52 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.service.ImUserFriendService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("imUserFriend")
+@Api(tags = "IM通讯录")
+@RestController
+public class ImUserFriendController extends BaseController {
+
+	@Autowired
+	private ImUserFriendService imUserFriendService;
+
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+
+	@ApiOperation("添加好友")
+	@PostMapping(value = "/add")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "memo", value = "备注", required = true, dataType = "String"),
+			@ApiImplicitParam(name = "nickname", value = "昵称", required = true, dataType = "String"),
+			@ApiImplicitParam(name = "friendUserId", value = "好友编号", required = true, dataType = "Integer")})
+	public Object addFriend(Integer friendUserId, String nickname, String memo) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		return succeed(imUserFriendService.addFriend(sysUser.getId(),friendUserId,nickname,memo));
+	}
+
+	@ApiOperation("删除好友")
+	@PostMapping(value = "/del")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "friendUserId", value = "好友编号", required = true, dataType = "Integer")})
+	public Object quitGroup(Integer friendUserId) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		return succeed(imUserFriendService.deleteFriend(sysUser.getId(),friendUserId));
+	}
+
+	@ApiOperation("修改昵称，备注")
+	@PostMapping(value = "/updateFriend")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "memo", value = "备注", required = true, dataType = "String"),
+			@ApiImplicitParam(name = "nickname", value = "昵称", required = true, dataType = "String"),
+			@ApiImplicitParam(name = "friendUserId", value = "好友编号", required = true, dataType = "Integer")})
+	public Object updateFriend(Integer friendUserId, String nickname, String memo) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		return succeed(imUserFriendService.updateFriendNickname(sysUser.getId(),friendUserId,nickname,memo));
+	}
+}