|
@@ -14,7 +14,7 @@ import java.util.*;
|
|
|
*/
|
|
|
public class CompanyOrgTypeNew extends UDF {
|
|
|
private static final List<String> FOREIGN = Arrays.asList("中外", "外资", "外国", "外商");
|
|
|
- private static final List<String> CHINA = Arrays.asList("国有", "国资");
|
|
|
+ private static final List<String> CHINA = Arrays.asList("国有", "国资", "全民");
|
|
|
|
|
|
public List<String> evaluate(String company_org_type, String company_name, String credit_code) {
|
|
|
if (isEmpty(company_name)) return null;
|
|
@@ -25,11 +25,11 @@ public class CompanyOrgTypeNew extends UDF {
|
|
|
|
|
|
//工商注册类型判断
|
|
|
List<String> result = new ArrayList<>();
|
|
|
- if (contains(company_org_type, "股份") && !contains(company_org_type, "合作") && contains(company_name, "公司")&&contains(company_name,"股份")) {
|
|
|
+ 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, "有限公司")) {
|
|
|
result.add("有限责任公司");
|
|
|
- } else if (contains(company_org_type, "股份合作")||contains(company_org_type,"股份制")) {
|
|
|
+ } else if (contains(company_org_type, "股份合作") || contains(company_org_type, "股份制")) {
|
|
|
result.add("股份合作企业");
|
|
|
} else if (contains(company_org_type, "个体") || contains(company_org_type, "个人经营")) {
|
|
|
result.add("个体工商户");
|