Procházet zdrojové kódy

feat: 公司类型返回array

JimZhang před 2 roky
rodič
revize
a9de3e6a6a

+ 3 - 3
src/main/java/com/winhc/bigdata/udf/CompanyOrgTypeNew.java

@@ -16,7 +16,7 @@ public class CompanyOrgTypeNew extends UDF {
     private static final List<String> FOREIGN = Arrays.asList("中外", "外资", "外国", "外商");
     private static final List<String> CHINA = Arrays.asList("国有", "国资");
 
-    public String evaluate(String company_org_type, String company_name, String credit_code) {
+    public List<String> evaluate(String company_org_type, String company_name, String credit_code) {
         if (isEmpty(company_name)) return null;
 //分公司判断
         if (contains(company_org_type, "分") || endsWith(company_name, "分公司")) {
@@ -24,7 +24,7 @@ public class CompanyOrgTypeNew extends UDF {
         }
 
 //工商注册类型判断
-        Set<String> result = new HashSet<>();
+        List<String> result = new ArrayList<>();
         if (contains(company_org_type, "股份") && !contains(company_org_type, "合作") && contains(company_name, "公司")&&contains(company_name,"股份")) {
             result.add("股份有限公司");
         } else if (contains(company_org_type, "有限责任") || contains(company_name, "有限责任公司") || contains(company_name, "有限公司")) {
@@ -61,7 +61,7 @@ public class CompanyOrgTypeNew extends UDF {
         if (result.isEmpty()) {
             return null;
         }
-        return JSON.toJSONString(result);
+        return result;
     }
 
     public static void main(String[] args) {