1.IP分组域配置修改增加修改人/时间

2.修复携带查询条件无法导出数据bug
3.优化分组域配置导入

src/main/java/com/nis/web/service/basics/CommonGroupManageService.java

@@ -269,7 +269,7 @@ public class CommonGroupManageService extends BaseService{
     	CommonGroupInfo entity = new CommonGroupInfo();
     	int serviceGroupId = 0;
     	entity.setGroupType(groupType);
-    	entity.setGroupName(groupName);
+    	entity.setGroupName(groupName.toUpperCase());
     	
     	CommonGroupInfo groupInfo = commonGroupManageDao.getGroupInfo(entity);
     	if(groupInfo == null) {
@@ -293,4 +293,11 @@ public class CommonGroupManageService extends BaseService{
     	return serviceGroupId;
     	
     }
+
+	public Integer getCountByGroupName(Set<String> set, Integer groupType) {
+		Integer count = commonGroupManageDao.getCountByGroupName(set, groupType);
+		return set.size()-count;
+	}
+    
+    
 }