| 
						
						
							
								
							
						
						
					 | 
					 | 
					@ -467,7 +467,8 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
											if (ObjectUtil.isNotEmpty(split)) { | 
					 | 
					 | 
					 | 
											if (ObjectUtil.isNotEmpty(split)) { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
												for (String dutyGroupId : split) { | 
					 | 
					 | 
					 | 
												for (String dutyGroupId : split) { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
													//查询班组信息
 | 
					 | 
					 | 
					 | 
													//查询班组信息
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
													List<ImsDutyGroupPEntity> list = imsDutyGroupPService.selectByGroupIds(Arrays.asList(Long.valueOf(dutyGroupId))); | 
					 | 
					 | 
					 | 
													Long num = Long.valueOf(StringUtils.isNotEmpty(groupId) ? groupId : "0"); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
													List<ImsDutyGroupPEntity> list = imsDutyGroupPService.selectByGroupIds(Arrays.asList(num)); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
													List<Long> collectPerson = list.stream().filter(iter -> iter.getGroupId().toString().equals(dutyGroupId)).map(iter -> iter.getPersonId()).collect(Collectors.toList()); | 
					 | 
					 | 
					 | 
													List<Long> collectPerson = list.stream().filter(iter -> iter.getGroupId().toString().equals(dutyGroupId)).map(iter -> iter.getPersonId()).collect(Collectors.toList()); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
													if (CollectionUtil.isNotEmpty(collectPerson)) { | 
					 | 
					 | 
					 | 
													if (CollectionUtil.isNotEmpty(collectPerson)) { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
														personIds = StringUtils.join(collectPerson, "^"); | 
					 | 
					 | 
					 | 
														personIds = StringUtils.join(collectPerson, "^"); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					 | 
					@ -497,7 +498,8 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
										String groupName = null; | 
					 | 
					 | 
					 | 
										String groupName = null; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
										if (imsSchedulingVo.getPersonType() == 1) { | 
					 | 
					 | 
					 | 
										if (imsSchedulingVo.getPersonType() == 1) { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
											//查询班组信息
 | 
					 | 
					 | 
					 | 
											//查询班组信息
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
											List<ImsDutyGroupPEntity> list = imsDutyGroupPService.selectByGroupIds(Arrays.asList(Long.valueOf(groupId))); | 
					 | 
					 | 
					 | 
											Long num = Long.valueOf(StringUtils.isNotEmpty(groupId) ? groupId : "0"); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
											List<ImsDutyGroupPEntity> list = imsDutyGroupPService.selectByGroupIds(Arrays.asList(num)); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
											collectPerson = list.stream().filter(iter -> iter.getGroupId().toString().equals(groupId)).map(iter -> iter.getPersonId()).collect(Collectors.toList()); | 
					 | 
					 | 
					 | 
											collectPerson = list.stream().filter(iter -> iter.getGroupId().toString().equals(groupId)).map(iter -> iter.getPersonId()).collect(Collectors.toList()); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
											if (CollectionUtil.isNotEmpty(collectPerson)) { | 
					 | 
					 | 
					 | 
											if (CollectionUtil.isNotEmpty(collectPerson)) { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
												personIds = StringUtils.join(collectPerson, "^"); | 
					 | 
					 | 
					 | 
												personIds = StringUtils.join(collectPerson, "^"); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					 | 
					
  |