bug:fix

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

@@ -88,4 +88,6 @@ public interface CooperationOrganDao extends BaseDAO<Integer, CooperationOrgan>
     * @date 2022/3/17 11:36
     */
     List<Map<Integer, String>> findFirstMusic();
+
+    List<CooperationOrgan> queryByOrganIdAndEnable(@Param("organId") String organId, @Param("enable") Boolean enable);
 }

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

@@ -47,7 +47,7 @@ public class SchoolStaff implements Serializable {
 	@TableField(value = "user_type_")
     private ESchoolStaffType userType;
 
-    @ApiModelProperty("帐号状态(注销 -1，冻结 9，激活 0)")
+    @ApiModelProperty("帐号状态(注销 -1，冻结 9，激活 1)")
 	@TableField(value = "status_")
     private String status;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/SchoolStaffWrapper.java

@@ -313,7 +313,7 @@ public class SchoolStaffWrapper {
     @NoArgsConstructor
     @AllArgsConstructor
     @ApiModel("学校统计信息")
-    public static class SchoolStaffStat implements Serializable {
+    public static class  SchoolStaffStat implements Serializable {
 
         @ApiModelProperty("校长数")
         private Integer schoolmasterNums;

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

@@ -17,6 +17,7 @@ public interface CooperationOrganService extends BaseService<Integer, Cooperatio
      * @return
      */
     List<CooperationOrgan> queryByOrganId(String organId);
+    List<CooperationOrgan> queryByOrganId(String organId,Boolean enable);
 
 
     /**

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

@@ -464,7 +464,7 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
     /**
      * 获取乐团信息
      */
-    Map<Long,MusicGroup> getMapByIds(List<String> musicGroupIds);
+    Map<String,MusicGroup> getMapByIds(List<String> musicGroupIds);
 
     /**
      * 获取乐团信息

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

@@ -9,7 +9,6 @@ import com.ym.mec.biz.dal.mapper.SchoolStaffMapper;
 import com.ym.mec.biz.service.CooperationOrganService;
 import com.ym.mec.biz.service.ImGroupMemberService;
 import com.ym.mec.biz.service.ImGroupService;
-import com.ym.mec.biz.service.SchoolStaffService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.apache.commons.collections.CollectionUtils;
@@ -77,6 +76,15 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 		return cooperationOrganDao.queryByOrganId(organId);
 	}
 
+
+    @Override
+    public List<CooperationOrgan> queryByOrganId(String organId,Boolean enable) {
+        if (enable == null || enable) {
+            return cooperationOrganDao.queryByOrganId(organId);
+        }
+        return cooperationOrganDao.queryByOrganIdAndEnable(organId,enable);
+    }
+
     @Override
     public List<MusicGroupPaymentCalender> getCooperationOrganCalender4School(Integer id) {
 		return cooperationOrganDao.getCooperationOrganCalender4School(id);

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.google.common.collect.Lists;
 import com.microsvc.toolkit.middleware.im.ImPluginContext;
 import com.microsvc.toolkit.middleware.im.ImPluginService;
 import com.microsvc.toolkit.middleware.im.message.ImGroupMemberWrapper;
@@ -381,8 +382,6 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         if (schoolStaffType.equals(ESchoolStaffType.ORCHESTRA_LEADER)) {
             groupChangeOwner(userId, imGroup.getId());
         }
-        imGroup.setMemberNum(imGroup.getMemberNum() + 1);
-        imGroupDao.update(imGroup);
         ImGroupMember imGroupMember = new ImGroupMember();
         imGroupMember.setImGroupId(imGroup.getId());
         imGroupMember.setUserId(userId);
@@ -390,6 +389,10 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         imGroupMember.setRoleType(schoolStaffType.getDescribe());
         imGroupMember.setTenantId(imGroup.getTenantId());
         imGroupMemberDao.insert(imGroupMember);
+
+
+        imGroup.setMemberNum(imGroupMemberDao.getByGroupId(Lists.newArrayList(imGroup.getId())).size());
+        imGroupDao.update(imGroup);
     }
 
     /**

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

@@ -4225,7 +4225,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
      * 获取乐团信息
      */
     @Override
-    public Map<Long, MusicGroup> getMapByIds(List<String> musicGroupIds) {
+    public Map<String, MusicGroup> getMapByIds(List<String> musicGroupIds) {
         if(CollectionUtils.isEmpty(musicGroupIds)){
             return new HashMap<>();
         }
@@ -4233,7 +4233,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if(CollectionUtils.isEmpty(musicGroupByIds)){
             return new HashMap<>();
         }
-        return musicGroupByIds.stream().collect(Collectors.toMap(o -> Long.parseLong(o.getId()), Function.identity()));
+        return musicGroupByIds.stream().collect(Collectors.toMap(MusicGroup::getId, Function.identity()));
     }
 
 

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

@@ -124,7 +124,7 @@ public class SchoolActivityDetailServiceImpl extends ServiceImpl<SchoolActivityD
                 .map(SchoolActivityDetailWrapper.SchoolActivityDetail::getMusicGroupId)
                 .collect(Collectors.toList());
 
-        Map<Long, MusicGroup> groupMap = musicGroupService.getMapByIds(musicGroupIds);
+        Map<String, MusicGroup> groupMap = musicGroupService.getMapByIds(musicGroupIds);
 
         // 设置声部名
         List<Integer> subjectIds = schoolActivityDetails.stream()
@@ -139,7 +139,7 @@ public class SchoolActivityDetailServiceImpl extends ServiceImpl<SchoolActivityD
 
             // 设置声部 人员数据
             SchoolActivityWrapper.SchoolActivityStudentQuery query = new SchoolActivityWrapper.SchoolActivityStudentQuery();
-            query.setMusicGroupId(schoolActivityDetail.getMusicGroupId().toString());
+            query.setMusicGroupId(schoolActivityDetail.getMusicGroupId());
             query.setActivityDetailId(schoolActivityDetail.getId());
             List<SchoolActivityWrapper.SchoolActivitySubject> schoolActivitySubjects = schoolActivityDetailUserService.getUserList(query);
 

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

@@ -293,7 +293,7 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
         selfMap.put(user.getId(), user.getPhone());
 
 
-        SysMessageConfig sysMessageConfig = sysMessageConfigDao.queryByType(MessageTypeEnum.JIGUANG_TEACHER_SIGN_IN_EXCEPTION.getCode());
+        SysMessageConfig sysMessageConfig = sysMessageConfigDao.queryByType(MessageTypeEnum.SMS_SCHOOL_ACCOUNT_REGISTER.getCode());
         String url = sysMessageConfig.getUrl();
 
         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.SMS_SCHOOL_ACCOUNT_REGISTER,
@@ -727,5 +727,21 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
 
     }
 
-
+    @Override
+    public boolean updateById(SchoolStaff entity) {
+        SchoolStaff schoolStaff = getById(entity.getId());
+        if (schoolStaff == null) {
+            throw new BizException("用户信息不存在");
+        }
+        SysUser sysUser = sysUserService.queryUserById(schoolStaff.getUserId().intValue());
+        if (StringUtils.isNotBlank(entity.getStatus())) {
+            if (entity.getStatus().equals("1")) {
+                sysUser.setLockFlag(0);
+            } else if (entity.getStatus().equals("9")) {
+                sysUser.setLockFlag(9);
+            }
+            teacherDao.updateUser(sysUser);
+        }
+        return super.updateById(entity);
+    }
 }

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

@@ -51,10 +51,10 @@
             useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         INSERT INTO cooperation_organ
         (id_, name_, linkman_, job_, mobile_no_, address_, organ_id_, create_time_, update_time_, ownership_type_,
-         is_enable_, full_job_resource_,education_user_id_,tenant_id_)
+         is_enable_, full_job_resource_,education_user_id_,tenant_id_,logo_)
         VALUES (#{id}, #{name}, #{linkman}, #{job}, #{mobileNo}, #{address}, #{organId}, now(), now(),
                 #{ownershipType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{isEnable},
-                #{fullJobResource},#{educationUserId},#{tenantId})
+                #{fullJobResource},#{educationUserId},#{tenantId},#{logo})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -217,4 +217,14 @@
         WHERE mg.create_time_ = co.create_time_
         ORDER BY mg.cooperation_organ_id_
     </select>
+
+    <select id="queryByOrganIdAndEnable" resultMap="CooperationOrgan">
+        SELECT *
+        FROM cooperation_organ
+        WHERE FIND_IN_SET(organ_id_, #{organId})
+          AND del_flag_ != 1
+        <if test="enable != null">
+            AND is_enable_ = #{enable}
+        </if>
+    </select>
 </mapper>

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

@@ -11,7 +11,7 @@
              , t1.user_type_
              , t1.tenant_id_
              , t1.organ_id_list_
-             , IFNULL(t2.real_name_, t2.username_) AS username
+             ,  t2.username_ AS username
              , t2.avatar_
              , t2.phone_                           AS mobile
              , t1.status_
@@ -60,13 +60,13 @@
 
     <update id="updateStatusAndRecoveryStatus">
         update school_staff ss left join sys_user su on su.id_ = ss.user_id_
-        set ss.status_ = if(#{status},0,9),ss.recovery_status_ = if(#{status},0,1),su.lock_flag_ = if(#{status},0,9)
-        where ss.school_id_ = #{cooperationOrganId} and ss.status_ in (0,9)
+        set ss.status_ = if(#{status},1,9),ss.recovery_status_ = if(#{status},0,1),su.lock_flag_ = if(#{status},0,9)
+        where ss.school_id_ = #{cooperationOrganId} and ss.status_ in (1,9)
         <if test="status">
             and ss.recovery_status_ = 1
         </if>
         <if test="status == false ">
-            and (ss.status_ = 0  or ss.status_ is null)
+            and (ss.status_ = 1  or ss.status_ is null)
         </if>
     </update>
 

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

@@ -12,6 +12,10 @@
 
         left join sys_user su on su.id_ = s.user_id_
         left join student_registration sr on sr.user_id_ = s.user_id_
+
+        <if test="param.cooperationOrganId != null">
+            left join music_group mg on mg.id_ = sr.music_group_id_
+        </if>
         <where>
             sr.music_group_status_ in
             <foreach collection="param.statusList" close=")" item="status" open="(" separator=",">
@@ -27,7 +31,7 @@
                 and s.subject_id_list_ = #{param.subjectId}
             </if>
             <if test="param.cooperationOrganId != null">
-                and s.cooperation_organ_id_ = #{param.cooperationOrganId}
+                and mg.cooperation_organ_id_ = #{param.cooperationOrganId}
             </if>
             <if test="param.studentId != null">
                 and s.user_id_ = #{param.studentId}

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

@@ -74,8 +74,8 @@ public class CooperationOrganController extends BaseController {
     @ApiOperation(value = "根据机构编号获取合作单位(教学点)列表")
     @GetMapping("/queryByOrganId")
     @PreAuthorize("@pcs.hasPermissions('cooperationOrgan/queryByOrganId')")
-    public Object queryByOrganId(String organId) {
-        return succeed(cooperationOrganService.queryByOrganId(organId));
+    public Object queryByOrganId(String organId,Boolean enable) {
+        return succeed(cooperationOrganService.queryByOrganId(organId,enable));
     }
 
     @ApiOperation(value = "根据合作单位id获取学校缴费")