Merge remote-tracking branch 'origin/HS-LaoBaiGan' into HS-LaoBaiGan

cjy-project/src/main/java/com/cjy/appointmentteamdata/service/impl/AppointmentTeamDataServiceImpl.java

@@ -166,11 +166,16 @@ public class AppointmentTeamDataServiceImpl implements IAppointmentTeamDataServi
 
 		List<AppointmentPeopleInfo> updateList = appointmentTeamData.getNewList().stream().filter(i -> i.getDataState().equals("u")).collect(Collectors.toList());
 		if (!updateList.isEmpty()) {
-//			updateList.stream().forEach(item->{
 				//批量修改
 				iAppointmentPeopleInfoService.updateAppointmentPeopleInfoList(updateList);
-//			});
-
+		}
+		List<AppointmentPeopleInfo>deleteList = appointmentTeamData.getNewList().stream().filter(i -> i.getDataState().equals("d")).collect(Collectors.toList());
+		if(!deleteList.isEmpty()){
+			List<Long> ids=new ArrayList<>();
+			deleteList.stream().forEach(j->{
+				ids.add(j.getId());
+			});
+			iAppointmentPeopleInfoService.deleteAppointmentPeopleInfoByIds(ids.toArray(new Long[ids.size()]));
 		}
 		return 1;
 	}