merge

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

@@ -23,25 +23,25 @@ import java.util.stream.Collectors;
 
 @Service
 public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, CooperationOrgan>  implements CooperationOrganService {
-
-    @Autowired
-    private CooperationOrganDao cooperationOrganDao;
-
-    @Autowired
-    private CooperationOrganLinkmanDao cooperationOrganLinkmanDao;
-
-    @Autowired
-    private MusicGroupDao musicGroupDao;
-    @Autowired
-    private ClassGroupDao classGroupDao;
-    @Autowired
-    private ImGroupMemberService imGroupMemberService;
-    @Autowired
-    private ImGroupService imGroupService;
-    @Autowired
-    private EmployeeDao employeeDao;
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
+	
+	@Autowired
+	private CooperationOrganDao cooperationOrganDao;
+	
+	@Autowired
+	private CooperationOrganLinkmanDao cooperationOrganLinkmanDao;
+	
+	@Autowired
+	private MusicGroupDao musicGroupDao;
+	@Autowired
+	private ClassGroupDao classGroupDao;
+	@Autowired
+	private ImGroupMemberService imGroupMemberService;
+	@Autowired
+	private ImGroupService imGroupService;
+	@Autowired
+	private EmployeeDao employeeDao;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
 
     @Autowired
     private SchoolStaffMapper schoolStaffMapper;
@@ -49,36 +49,36 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
     @Autowired
     private SysUserService sysUserService;
 
-    @Override
-    public BaseDAO<Integer, CooperationOrgan> getDAO() {
-        return cooperationOrganDao;
-    }
+	@Override
+	public BaseDAO<Integer, CooperationOrgan> getDAO() {
+		return cooperationOrganDao;
+	}
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public long insert(CooperationOrgan cooperationOrgan) {
-        Date date = new Date();
-        cooperationOrgan.setCreateTime(date);
-        cooperationOrgan.setUpdateTime(date);
-        super.insert(cooperationOrgan);
-
-        List<CooperationOrganLinkman> list = cooperationOrgan.getCooperationOrganLinkmanList();
-
-        if (list != null && list.size() > 0) {
-            for (CooperationOrganLinkman co : list) {
-                co.setCreateTime(date);
-                co.setCooperationOrganId(cooperationOrgan.getId());
-            }
-            cooperationOrganLinkmanDao.batchInsert(list);
-        }
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public long insert(CooperationOrgan cooperationOrgan) {
+		Date date = new Date();
+		cooperationOrgan.setCreateTime(date);
+		cooperationOrgan.setUpdateTime(date);
+		super.insert(cooperationOrgan);
 
-        return 1;
-    }
+		List<CooperationOrganLinkman> list = cooperationOrgan.getCooperationOrganLinkmanList();
 
-    @Override
-    public List<CooperationOrgan> queryByOrganId(String organId) {
-        return cooperationOrganDao.queryByOrganId(organId);
-    }
+		if (list != null && list.size() > 0) {
+			for (CooperationOrganLinkman co : list) {
+				co.setCreateTime(date);
+				co.setCooperationOrganId(cooperationOrgan.getId());
+			}
+			cooperationOrganLinkmanDao.batchInsert(list);
+		}
+
+		return 1;
+	}
+
+	@Override
+	public List<CooperationOrgan> queryByOrganId(String organId) {
+		return cooperationOrganDao.queryByOrganId(organId);
+	}
 
 
     @Override
@@ -91,61 +91,61 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 
     @Override
     public List<MusicGroupPaymentCalender> getCooperationOrganCalender4School(Integer id) {
-        return cooperationOrganDao.getCooperationOrganCalender4School(id);
+		return cooperationOrganDao.getCooperationOrganCalender4School(id);
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void updateCooperation(CooperationOrgan cooperationOrgan) {
-        CooperationOrgan cooperationOrgan1 = cooperationOrganDao.get(cooperationOrgan.getId());
-        //修改了乐团主管后，修改关联乐团的乐团主管
-        if(!cooperationOrgan.getEducationUserId().equals(cooperationOrgan1.getEducationUserId())){
-            SysUser sysUser = sysUserFeignService.queryUserById(cooperationOrgan.getEducationUserId());
-            //获取进行中、暂停、筹备中的乐团列表
-            List<MusicGroup> musicGroups = musicGroupDao.findByCooperationIdAndStatus(cooperationOrgan.getId());
-            if(musicGroups.size() > 0){
-                for (MusicGroup musicGroup : musicGroups) {
-                    //获取当前乐团所有班级
-                    List<ClassGroup> classGroups = classGroupDao.findClassGroups(musicGroup.getId());
-                    if (classGroups == null || classGroups.size() == 0) {
-                        continue;
-                    }
-                    Integer educationalTeacherId = musicGroup.getEducationalTeacherId();
-                    classGroups.forEach(e -> {
-                        if(educationalTeacherId != null){
-                            imGroupMemberService.quit(e.getId().toString(), educationalTeacherId);
-                        }
-                        imGroupMemberService.join(e.getId().toString(),"乐团主管",false,null,sysUser);
-                    });
-                }
-            }
-            //更新预报名群信息
-            List<MusicGroup> musicGroupList = musicGroupDao.findByCooperationId(cooperationOrgan.getId());
-            if(musicGroupList.size() > 0){
-                for (MusicGroup musicGroup : musicGroupList) {
-                    //不是导入的乐团
-                    if(musicGroup.getId().length() > 10){
-                        //是否有预报名的群聊
-                        ImGroup imGroup = imGroupService.get(musicGroup.getId());
-                        if(imGroup != null){
-                            imGroupMemberService.quit(musicGroup.getId(),musicGroup.getEducationalTeacherId());
-                            imGroupMemberService.join(musicGroup.getId(),"乐团主管",false,imGroup,sysUser);
-                        }
-                    }
-                }
-            }
-            //修改乐团主管
-            musicGroupDao.batchUpdateEdu(cooperationOrgan.getId(),cooperationOrgan.getEducationUserId());
-        }
-
-        //修改了合作单位联系人
-        cooperationOrganLinkmanDao.deleteByCooperationOrganId(cooperationOrgan.getId());
-        List<CooperationOrganLinkman> cooperationOrganLinkmanList = cooperationOrgan.getCooperationOrganLinkmanList();
-        if(cooperationOrganLinkmanList != null && cooperationOrganLinkmanList.size() > 0){
-            cooperationOrganLinkmanDao.batchInsert(cooperationOrganLinkmanList);
-        }
-
-        cooperationOrganDao.update(cooperationOrgan);
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void updateCooperation(CooperationOrgan cooperationOrgan) {
+		CooperationOrgan cooperationOrgan1 = cooperationOrganDao.get(cooperationOrgan.getId());
+		//修改了乐团主管后，修改关联乐团的乐团主管
+		if(!cooperationOrgan.getEducationUserId().equals(cooperationOrgan1.getEducationUserId())){
+			SysUser sysUser = sysUserFeignService.queryUserById(cooperationOrgan.getEducationUserId());
+			//获取进行中、暂停、筹备中的乐团列表
+			List<MusicGroup> musicGroups = musicGroupDao.findByCooperationIdAndStatus(cooperationOrgan.getId());
+			if(musicGroups.size() > 0){
+				for (MusicGroup musicGroup : musicGroups) {
+					//获取当前乐团所有班级
+					List<ClassGroup> classGroups = classGroupDao.findClassGroups(musicGroup.getId());
+					if (classGroups == null || classGroups.size() == 0) {
+						continue;
+					}
+					Integer educationalTeacherId = musicGroup.getEducationalTeacherId();
+					classGroups.forEach(e -> {
+						if(educationalTeacherId != null){
+							imGroupMemberService.quit(e.getId().toString(), educationalTeacherId);
+						}
+						imGroupMemberService.join(e.getId().toString(),"乐团主管",false,null,sysUser);
+					});
+				}
+			}
+			//更新预报名群信息
+			List<MusicGroup> musicGroupList = musicGroupDao.findByCooperationId(cooperationOrgan.getId());
+			if(musicGroupList.size() > 0){
+				for (MusicGroup musicGroup : musicGroupList) {
+					//不是导入的乐团
+					if(musicGroup.getId().length() > 10){
+						//是否有预报名的群聊
+						ImGroup imGroup = imGroupService.get(musicGroup.getId());
+						if(imGroup != null){
+							imGroupMemberService.quit(musicGroup.getId(),musicGroup.getEducationalTeacherId());
+							imGroupMemberService.join(musicGroup.getId(),"乐团主管",false,imGroup,sysUser);
+						}
+					}
+				}
+			}
+			//修改乐团主管
+			musicGroupDao.batchUpdateEdu(cooperationOrgan.getId(),cooperationOrgan.getEducationUserId());
+		}
+		
+		//修改了合作单位联系人
+		cooperationOrganLinkmanDao.deleteByCooperationOrganId(cooperationOrgan.getId());
+		List<CooperationOrganLinkman> cooperationOrganLinkmanList = cooperationOrgan.getCooperationOrganLinkmanList();
+		if(cooperationOrganLinkmanList != null && cooperationOrganLinkmanList.size() > 0){
+			cooperationOrganLinkmanDao.batchInsert(cooperationOrganLinkmanList);
+		}
+		
+		cooperationOrganDao.update(cooperationOrgan);
 
         // 修改合作单位下的用户，改为锁定
 
@@ -157,62 +157,62 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
         }
 
         schoolStaffMapper.updateStatusAndRecoveryStatus(cooperationOrgan.getIsEnable(), cooperationOrgan.getId());
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void updateCooperationEdu(List<Integer> organIds) {
-        List<CooperationOrgan> organList = cooperationOrganDao.getCooperationOrganByIds(organIds);
-        for (CooperationOrgan cooperationOrgan : organList) {
-            if(cooperationOrgan.getEducationUserId() != null){
-                Employee employee = employeeDao.get(cooperationOrgan.getEducationUserId());
-                if(employee != null){
-                    //获取进行中、暂停、筹备中的乐团列表
-                    List<MusicGroup> musicGroups = musicGroupDao.findByCooperationIdAndStatus(cooperationOrgan.getId());
-                    if(musicGroups.size() > 0){
-                        for (MusicGroup musicGroup : musicGroups) {
-                            //获取当前乐团所有班级
-                            List<ClassGroup> classGroups = classGroupDao.findClassGroups(musicGroup.getId());
-                            if (classGroups == null || classGroups.size() == 0) {
-                                continue;
-                            }
-                            Integer educationalTeacherId = musicGroup.getEducationalTeacherId();
-                            List<Integer> quitUserIdList = new ArrayList<Integer>();
-                            if(educationalTeacherId != null){
-                                quitUserIdList.add(educationalTeacherId);
-                            }
-                            Map<Integer, String> userRoleMap = new HashMap<Integer, String>(1);
-                            userRoleMap.put(cooperationOrgan.getEducationUserId(), "乐团主管");
-                            classGroups.forEach(e -> {
-                                if(educationalTeacherId != null){
-                                    imGroupMemberService.quit(e.getId().toString(), quitUserIdList);
-                                }
-                                imGroupMemberService.join(e.getId().toString(), userRoleMap);
-                            });
-                        }
-                    }
-                    //更新预报名群信息
-                    List<MusicGroup> musicGroupList = musicGroupDao.findByCooperationId(cooperationOrgan.getId());
-                    if(musicGroupList.size() > 0){
-                        for (MusicGroup musicGroup : musicGroupList) {
-                            //不是导入的乐团
-                            if(musicGroup.getId().length() > 10){
-                                //是否有预报名的群聊
-                                ImGroup imGroup = imGroupService.get(musicGroup.getId());
-                                if(imGroup != null){
-                                    imGroupMemberService.quit(musicGroup.getId(),musicGroup.getEducationalTeacherId());
-                                    imGroupMemberService.join(musicGroup.getId(),cooperationOrgan.getEducationUserId(),"乐团主管",false);
-                                }
-                            }
-                        }
-                    }
-                    //修改乐团主管
-                    musicGroupDao.batchUpdateEdu(cooperationOrgan.getId(),cooperationOrgan.getEducationUserId());
-                    System.out.println(cooperationOrgan.getName() + "  OK");
-                }
-            }
-        }
-    }
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void updateCooperationEdu(List<Integer> organIds) {
+		List<CooperationOrgan> organList = cooperationOrganDao.getCooperationOrganByIds(organIds);
+		for (CooperationOrgan cooperationOrgan : organList) {
+			if(cooperationOrgan.getEducationUserId() != null){
+				Employee employee = employeeDao.get(cooperationOrgan.getEducationUserId());
+				if(employee != null){
+					//获取进行中、暂停、筹备中的乐团列表
+					List<MusicGroup> musicGroups = musicGroupDao.findByCooperationIdAndStatus(cooperationOrgan.getId());
+					if(musicGroups.size() > 0){
+						for (MusicGroup musicGroup : musicGroups) {
+							//获取当前乐团所有班级
+							List<ClassGroup> classGroups = classGroupDao.findClassGroups(musicGroup.getId());
+							if (classGroups == null || classGroups.size() == 0) {
+								continue;
+							}
+							Integer educationalTeacherId = musicGroup.getEducationalTeacherId();
+							List<Integer> quitUserIdList = new ArrayList<Integer>();
+							if(educationalTeacherId != null){
+								quitUserIdList.add(educationalTeacherId);
+							}
+							Map<Integer, String> userRoleMap = new HashMap<Integer, String>(1);
+							userRoleMap.put(cooperationOrgan.getEducationUserId(), "乐团主管");
+							classGroups.forEach(e -> {
+								if(educationalTeacherId != null){
+									imGroupMemberService.quit(e.getId().toString(), quitUserIdList);
+								}
+								imGroupMemberService.join(e.getId().toString(), userRoleMap);
+							});
+						}
+					}
+					//更新预报名群信息
+					List<MusicGroup> musicGroupList = musicGroupDao.findByCooperationId(cooperationOrgan.getId());
+					if(musicGroupList.size() > 0){
+						for (MusicGroup musicGroup : musicGroupList) {
+							//不是导入的乐团
+							if(musicGroup.getId().length() > 10){
+								//是否有预报名的群聊
+								ImGroup imGroup = imGroupService.get(musicGroup.getId());
+								if(imGroup != null){
+									imGroupMemberService.quit(musicGroup.getId(),musicGroup.getEducationalTeacherId());
+									imGroupMemberService.join(musicGroup.getId(),cooperationOrgan.getEducationUserId(),"乐团主管",false);
+								}
+							}
+						}
+					}
+					//修改乐团主管
+					musicGroupDao.batchUpdateEdu(cooperationOrgan.getId(),cooperationOrgan.getEducationUserId());
+					System.out.println(cooperationOrgan.getName() + "  OK");
+				}
+			}
+		}
+	}
 
     /**
      * 根据合作单位id获取合作单位信息