ERP搜索平台企业接口增加

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@2932 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/controller/PublicQueryController.java

@@ -26,6 +26,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.UserDao;
 import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.EnterpriseDetail;
 import com.uas.platform.b2b.model.QueriableMember;
 import com.uas.platform.b2b.model.QueriableUser;
 import com.uas.platform.b2b.model.User;
@@ -358,4 +359,31 @@ public class PublicQueryController {
 		checkinfos.put("ok", ok);
 		return checkinfos;
 	}
+	
+	/**
+	 * 按企业名称、简称、UU号等查找企业信息
+	 * 
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(value = "/enterprises", method = RequestMethod.GET)
+	@ResponseBody
+	@ResponseStatus(value = HttpStatus.OK)
+	public List<EnterpriseDetail> queryEnterprise(String name, String shortName)
+			throws UnsupportedEncodingException {
+		List<EnterpriseDetail> members=new ArrayList<EnterpriseDetail>();
+		if (!StringUtils.isEmpty(name)) {
+			Set<Enterprise> enterprises = enterpriseService.findByNameKey(name);
+			if (!CollectionUtils.isEmpty(enterprises))
+				members.addAll(EnterpriseDetail.getMembers(enterprises));
+		}
+		if (!StringUtils.isEmpty(shortName)) {
+			Set<Enterprise> enterprises = enterpriseService
+					.findByShortName(shortName);
+			if (!CollectionUtils.isEmpty(enterprises))
+				members.addAll(EnterpriseDetail.getMembers(enterprises));
+		}		
+		return members;
+	}
+
 }