Browse Source

feat(日志):用户操作日志

liutao 7 months ago
parent
commit
c0331e9e14

+ 25 - 1
src/main/java/com/sunxung/factoring/component/constance/ProjectCoreEnterpriseScoringModel.java

@@ -135,7 +135,31 @@ public class ProjectCoreEnterpriseScoringModel {
     /**
      * 经营地区标准分
      */
-    public static final BigDecimal BUSINESS_ADDRESS_TANDARD = new BigDecimal("100");
+    public static final BigDecimal BUSINESS_ADDRESS_TANDARD_ONE = new BigDecimal("100");
+    /**
+     * 经营地区标准分
+     */
+    public static final BigDecimal BUSINESS_ADDRESS_TANDARD_TWO = new BigDecimal("100");
+    /**
+     * 经营地区标准分
+     */
+    public static final BigDecimal BUSINESS_ADDRESS_TANDARD_THREE = new BigDecimal("100");
+    /**
+     * 经营地区标准分
+     */
+    public static final BigDecimal BUSINESS_ADDRESS_TANDARD_FORE = new BigDecimal("100");
+    /**
+     * 经营地区标准分
+     */
+    public static final BigDecimal BUSINESS_ADDRESS_TANDARD_FIVE = new BigDecimal("100");
+    /**
+     * 经营地区标准分
+     */
+    public static final BigDecimal BUSINESS_ADDRESS_TANDARD_SIX = new BigDecimal("100");
+    /**
+     * 经营地区标准分
+     */
+    public static final BigDecimal BUSINESS_ADDRESS_TANDARD_SEVEN = new BigDecimal("100");
 
     /**
      * 信用评级 权重体系

+ 7 - 3
src/main/java/com/sunxung/factoring/component/constance/ProjectScoringModel.java

@@ -208,6 +208,10 @@ public class ProjectScoringModel {
      * 控股比例 标准分5 事业单位
      */
     public static final BigDecimal HOLDING_RATIO_STANDARD_FIVE = new BigDecimal("100");
+    /**
+     * 控股比例 标准分6 民营非上市公司
+     */
+    public static final BigDecimal HOLDING_RATIO_STANDARD_SIX = new BigDecimal("60");
 
     /**
      * 股权层级 权重体系
@@ -230,7 +234,7 @@ public class ProjectScoringModel {
      */
     public static final String EQUITY_HIERARCHY_STANDARD_FORE = "不准入";
     /**
-     * 股权层级标准分5 非建筑类公司 本级、事业单位
+     * 股权层级标准分5 非建筑类公司 本级
      */
     public static final BigDecimal EQUITY_HIERARCHY_STANDARD_FIVE = new BigDecimal("100");
     /**
@@ -250,9 +254,9 @@ public class ProjectScoringModel {
      */
     public static final String EQUITY_HIERARCHY_STANDARD_NINE = "不准入";
     /**
-     * 股权层级标准分8 非建筑类公司 事业单位
+     * 股权层级标准分8 非建筑类公司 民营公司
      */
-    public static final BigDecimal EQUITY_HIERARCHY_STANDARD_TEN = new BigDecimal("100");
+    public static final BigDecimal EQUITY_HIERARCHY_STANDARD_TEN = new BigDecimal("60");
 
     /**
      * 信用评级 权重体系

+ 3 - 3
src/main/java/com/sunxung/factoring/dict/impl/EquityHierarchyDetailTwoDict.java

@@ -25,9 +25,9 @@ public class EquityHierarchyDetailTwoDict extends Dict {
      */
     public static enum ChildEnum {
         /**
-         * 本级
+         * 本级、事业单位
          */
-        ONE("equityHierarchyDetail_2_A", "本级"),
+        ONE("equityHierarchyDetail_2_A", "本级、事业单位"),
         /**
          * 一级
          */
@@ -47,7 +47,7 @@ public class EquityHierarchyDetailTwoDict extends Dict {
         /**
          * 民营公司
          */
-        SIX("equityHierarchyDetail_2_F", "事业单位");
+        SIX("equityHierarchyDetail_2_F", "民营公司");
         /**
          * 编码
          */

+ 13 - 1
src/main/java/com/sunxung/factoring/dict/impl/HoldingRatioDict.java

@@ -35,7 +35,19 @@ public class HoldingRatioDict extends Dict {
         /**
          * 控股比例>67%
          */
-        THREE("holdingRatio_3", "控股比例>67%");
+        THREE("holdingRatio_3", "控股比例>67%"),
+        /**
+         * 民营主板、科创板上市公司
+         */
+        FORE("holdingRatio_4", "民营主板、科创板上市公司"),
+        /**
+         * 事业单位
+         */
+        FIVE("holdingRatio_5", "事业单位"),
+        /**
+         * 民营非上市公司
+         */
+        SIX("holdingRatio_6", "民营非上市公司");
         /**
          * 编码
          */

+ 92 - 15
src/main/java/com/sunxung/factoring/service/project/impl/ProjectAuditServiceImpl.java

@@ -457,7 +457,46 @@ public class ProjectAuditServiceImpl extends ServiceImpl<ProjectAuditMapper, Pro
                 admitted = ProjectScoringModel.NOT_ADMITTED;
                 errors.add("注册(登记)地址不准入!");
             }else {
-                registeredAddressScore = ProjectScoringModel.REGISTERED_ADDRESS_RATIO.multiply(ProjectScoringModel.REGISTERED_ADDRESS_TANDARD);
+                if (address.contains("广东") || address.contains("江苏")) {
+                    if (address.contains("深圳") || address.contains("广州") || address.contains("佛山") || address.contains("东莞")
+                            || address.contains("东莞") || address.contains("东莞") || address.contains("东莞")
+                            || address.contains("东莞") || address.contains("东莞") || address.contains("东莞")) {
+                        registeredAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_ONE);
+                    } else {
+                        registeredAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_TWO);
+                    }
+                } else if (address.contains("山东") || address.contains("浙江")) {
+                    if (address.contains("青岛") || address.contains("济南") || address.contains("烟台")
+                            || address.contains("杭州") || address.contains("宁波") || address.contains("温州")) {
+                        registeredAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_TWO);
+                    } else {
+                        registeredAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_THREE);
+                    }
+                } else if (address.contains("河南") || address.contains("四川") || address.contains("湖北") || address.contains("福建")
+                        || address.contains("湖南") || address.contains("安徽") || address.contains("上海") || address.contains("河北") || address.contains("北京")) {
+                    if(address.contains("郑州") || address.contains("成都") || address.contains("武汉")
+                            || address.contains("福州") || address.contains("泉州") || address.contains("合肥")
+                            || address.contains("唐山") || address.contains("长沙") || address.contains("北京") || address.contains("上海")){
+                        registeredAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_THREE);
+                    }else {
+                        registeredAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_FORE);
+                    }
+                }else if(address.contains("陕西") || address.contains("江西") || address.contains("重庆") ||address.contains("云南")
+                        || address.contains("广西") || address.contains("山西") || address.contains("内蒙") || address.contains("贵州")){
+                    if(address.contains("西安") || address.contains("重庆")){
+                        registeredAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_FORE);
+                    }else {
+                        registeredAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_FIVE);
+                    }
+                }else if(address.contains("新疆") || address.contains("天津") || address.contains("甘肃") ){
+                    if(address.contains("甘肃")){
+                        registeredAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_FIVE);
+                    }else {
+                        registeredAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_SIX);
+                    }
+                }else if(address.contains("海南") || address.contains("宁夏") || address.contains("青海") ||address.contains("西藏")){
+                    registeredAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_SEVEN);
+                }
             }
             projectOwnerScore.setRegisteredAddressScore(registeredAddressScore);
             //经营地址得分
@@ -467,7 +506,46 @@ public class ProjectAuditServiceImpl extends ServiceImpl<ProjectAuditMapper, Pro
                 admitted = ProjectScoringModel.NOT_ADMITTED;
                 errors.add("经营地址不准入!");
             }else {
-                businessAddressScore = ProjectScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectScoringModel.BUSINESS_ADDRESS_TANDARD);
+                if (businessAddress.contains("广东") || businessAddress.contains("江苏")) {
+                    if (businessAddress.contains("深圳") || businessAddress.contains("广州") || businessAddress.contains("佛山") || businessAddress.contains("东莞")
+                            || businessAddress.contains("东莞") || businessAddress.contains("东莞") || businessAddress.contains("东莞")
+                            || businessAddress.contains("东莞") || businessAddress.contains("东莞") || businessAddress.contains("东莞")) {
+                        businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_ONE);
+                    } else {
+                        businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_TWO);
+                    }
+                } else if (businessAddress.contains("山东") || businessAddress.contains("浙江")) {
+                    if (businessAddress.contains("青岛") || businessAddress.contains("济南") || businessAddress.contains("烟台")
+                            || businessAddress.contains("杭州") || businessAddress.contains("宁波") || businessAddress.contains("温州")) {
+                        businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_TWO);
+                    } else {
+                        businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_THREE);
+                    }
+                } else if (businessAddress.contains("河南") || businessAddress.contains("四川") || businessAddress.contains("湖北") || businessAddress.contains("福建")
+                        || businessAddress.contains("湖南") || businessAddress.contains("安徽") || businessAddress.contains("上海") || businessAddress.contains("河北") || businessAddress.contains("北京")) {
+                    if(businessAddress.contains("郑州") || businessAddress.contains("成都") || businessAddress.contains("武汉")
+                            || businessAddress.contains("福州") || businessAddress.contains("泉州") || businessAddress.contains("合肥")
+                            || businessAddress.contains("唐山") || businessAddress.contains("长沙") || businessAddress.contains("北京") || businessAddress.contains("上海")){
+                        businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_THREE);
+                    }else {
+                        businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_FORE);
+                    }
+                }else if(businessAddress.contains("陕西") || businessAddress.contains("江西") || businessAddress.contains("重庆") ||businessAddress.contains("云南")
+                        || businessAddress.contains("广西") || businessAddress.contains("山西") || businessAddress.contains("内蒙") || businessAddress.contains("贵州")){
+                    if(businessAddress.contains("西安") || businessAddress.contains("重庆")){
+                        businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_FORE);
+                    }else {
+                        businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_FIVE);
+                    }
+                }else if(businessAddress.contains("新疆") || businessAddress.contains("天津") || businessAddress.contains("甘肃") ){
+                    if(businessAddress.contains("甘肃")){
+                        businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_FIVE);
+                    }else {
+                        businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_SIX);
+                    }
+                }else if(businessAddress.contains("海南") || businessAddress.contains("宁夏") || businessAddress.contains("青海") ||businessAddress.contains("西藏")){
+                    businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_SEVEN);
+                }
             }
             projectOwnerScore.setBusinessAddressScore(businessAddressScore);
             //注册资本得分
@@ -511,20 +589,19 @@ public class ProjectAuditServiceImpl extends ServiceImpl<ProjectAuditMapper, Pro
             projectOwnerScore.setEnterpriseNatureScore(enterpriseNatureScore);
             //控股比例得分
             BigDecimal holdingRatioScore = BigDecimal.ZERO;
-            if (projectAuditInfo.getEnterpriseNature().equals(EnterpriseNatureDict.ChildEnum.ONE.getCode())) {
-                holdingRatioScore = ProjectScoringModel.HOLDING_RATIO.multiply(ProjectScoringModel.HOLDING_RATIO_STANDARD_FIVE);
-            }else if (projectAuditInfo.getEnterpriseNatureDetail() != null && (projectAuditInfo.getEnterpriseNatureDetail().equals("enterpriseNature_9_A") || projectAuditInfo.getEnterpriseNatureDetail().equals("enterpriseNature_9_B"))) {
-
+            if (projectAuditInfo.getHoldingRatio().equals(HoldingRatioDict.ChildEnum.ONE.getCode())) {
+                admitted = ProjectScoringModel.NOT_ADMITTED;
+                errors.add("控股比例不准入!");
+            } else if (projectAuditInfo.getHoldingRatio().equals(HoldingRatioDict.ChildEnum.TWO.getCode())) {
+                holdingRatioScore = ProjectScoringModel.HOLDING_RATIO.multiply(ProjectScoringModel.HOLDING_RATIO_STANDARD_TWO);
+            }else if (projectAuditInfo.getHoldingRatio().equals(HoldingRatioDict.ChildEnum.THREE.getCode())){
+                holdingRatioScore = ProjectScoringModel.HOLDING_RATIO.multiply(ProjectScoringModel.HOLDING_RATIO_STANDARD_THREE);
+            }else if(projectAuditInfo.getHoldingRatio().equals(HoldingRatioDict.ChildEnum.FORE.getCode())){
                 holdingRatioScore = ProjectScoringModel.HOLDING_RATIO.multiply(ProjectScoringModel.HOLDING_RATIO_STANDARD_FORE);
-            }else {
-                if (projectAuditInfo.getHoldingRatio().equals(HoldingRatioDict.ChildEnum.ONE.getCode())) {
-                    admitted = ProjectScoringModel.NOT_ADMITTED;
-                    errors.add("控股比例不准入!");
-                } else if (projectAuditInfo.getHoldingRatio().equals(HoldingRatioDict.ChildEnum.TWO.getCode())) {
-                    holdingRatioScore = ProjectScoringModel.HOLDING_RATIO.multiply(ProjectScoringModel.HOLDING_RATIO_STANDARD_TWO);
-                }else if (projectAuditInfo.getHoldingRatio().equals(HoldingRatioDict.ChildEnum.THREE.getCode())){
-                    holdingRatioScore = ProjectScoringModel.HOLDING_RATIO.multiply(ProjectScoringModel.HOLDING_RATIO_STANDARD_THREE);
-                }
+            }else if(projectAuditInfo.getHoldingRatio().equals(HoldingRatioDict.ChildEnum.FIVE.getCode())){
+                holdingRatioScore = ProjectScoringModel.HOLDING_RATIO.multiply(ProjectScoringModel.HOLDING_RATIO_STANDARD_FIVE);
+            }else if(projectAuditInfo.getHoldingRatio().equals(HoldingRatioDict.ChildEnum.SIX.getCode())){
+                holdingRatioScore = ProjectScoringModel.HOLDING_RATIO.multiply(ProjectScoringModel.HOLDING_RATIO_STANDARD_SIX);
             }
             projectOwnerScore.setHoldingRatioScore(holdingRatioScore);
             //股权层级得分

+ 42 - 4
src/main/java/com/sunxung/factoring/service/project/impl/ProjectCoreEnterpriseAuditServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sunxung.factoring.component.constance.ProjectCoreEnterpriseScoringModel;
 import com.sunxung.factoring.component.constance.ProjectScoringModel;
+import com.sunxung.factoring.component.constance.SupplierScoringModel;
 import com.sunxung.factoring.component.enums.ProjectAndEnterpriseStatusEnums;
 import com.sunxung.factoring.component.enums.SupplierStatusEnums;
 import com.sunxung.factoring.component.util.*;
@@ -395,12 +396,51 @@ public class ProjectCoreEnterpriseAuditServiceImpl extends ServiceImpl<ProjectCo
         }
         projectCoreEnterpriseScore.setRegisteredCapitalScore(registeredCapitalScore);
         //经营地址得分
-        BigDecimal businessAddressScore;
+        BigDecimal businessAddressScore = BigDecimal.ZERO;
         String businessAddress = enterprise.getBusinessAddress();
         if (businessAddress.contains("黑龙江") || businessAddress.contains("辽宁") || businessAddress.contains("吉林")) {
             businessAddressScore = BigDecimal.ZERO;
         } else {
-            businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD);
+            if (businessAddress.contains("广东") || businessAddress.contains("江苏")) {
+                if (businessAddress.contains("深圳") || businessAddress.contains("广州") || businessAddress.contains("佛山") || businessAddress.contains("东莞")
+                        || businessAddress.contains("东莞") || businessAddress.contains("东莞") || businessAddress.contains("东莞")
+                        || businessAddress.contains("东莞") || businessAddress.contains("东莞") || businessAddress.contains("东莞")) {
+                    businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_ONE);
+                } else {
+                    businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_TWO);
+                }
+            } else if (businessAddress.contains("山东") || businessAddress.contains("浙江")) {
+                if (businessAddress.contains("青岛") || businessAddress.contains("济南") || businessAddress.contains("烟台")
+                        || businessAddress.contains("杭州") || businessAddress.contains("宁波") || businessAddress.contains("温州")) {
+                    businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_TWO);
+                } else {
+                    businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_THREE);
+                }
+            } else if (businessAddress.contains("河南") || businessAddress.contains("四川") || businessAddress.contains("湖北") || businessAddress.contains("福建")
+                    || businessAddress.contains("湖南") || businessAddress.contains("安徽") || businessAddress.contains("上海") || businessAddress.contains("河北") || businessAddress.contains("北京")) {
+                if(businessAddress.contains("郑州") || businessAddress.contains("成都") || businessAddress.contains("武汉")
+                        || businessAddress.contains("福州") || businessAddress.contains("泉州") || businessAddress.contains("合肥")
+                        || businessAddress.contains("唐山") || businessAddress.contains("长沙") || businessAddress.contains("北京") || businessAddress.contains("上海")){
+                    businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_THREE);
+                }else {
+                    businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_FORE);
+                }
+            }else if(businessAddress.contains("陕西") || businessAddress.contains("江西") || businessAddress.contains("重庆") ||businessAddress.contains("云南")
+                    || businessAddress.contains("广西") || businessAddress.contains("山西") || businessAddress.contains("内蒙") || businessAddress.contains("贵州")){
+                if(businessAddress.contains("西安") || businessAddress.contains("重庆")){
+                    businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_FORE);
+                }else {
+                    businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_FIVE);
+                }
+            }else if(businessAddress.contains("新疆") || businessAddress.contains("天津") || businessAddress.contains("甘肃") ){
+                if(businessAddress.contains("甘肃")){
+                    businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_FIVE);
+                }else {
+                    businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_SIX);
+                }
+            }else if(businessAddress.contains("海南") || businessAddress.contains("宁夏") || businessAddress.contains("青海") ||businessAddress.contains("西藏")){
+                businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_SEVEN);
+            }
         }
         projectCoreEnterpriseScore.setBusinessAddressScore(businessAddressScore);
         //企业性质得分
@@ -456,8 +496,6 @@ public class ProjectCoreEnterpriseAuditServiceImpl extends ServiceImpl<ProjectCo
                 equityHierarchyScore = ProjectCoreEnterpriseScoringModel.EQUITY_HIERARCHY_RATIO.multiply(ProjectCoreEnterpriseScoringModel.EQUITY_HIERARCHY_STANDARD_EIGHT);
             } else if (projectCoreEnterpriseAuditInfo.getEquityHierarchyDetail().equals(EquityHierarchyDetailTwoDict.ChildEnum.FIVE.getCode())) {
                 equityHierarchyScore = BigDecimal.ZERO;
-            } else if (projectCoreEnterpriseAuditInfo.getEquityHierarchyDetail().equals(EquityHierarchyDetailTwoDict.ChildEnum.SIX.getCode())) {
-                equityHierarchyScore = ProjectScoringModel.EQUITY_HIERARCHY_RATIO.multiply(ProjectScoringModel.EQUITY_HIERARCHY_STANDARD_TEN);
             }
         }
         projectCoreEnterpriseScore.setEquityHierarchyScore(equityHierarchyScore);

+ 1 - 1
src/main/java/com/sunxung/factoring/service/supplier/impl/SupplierApprovalSecondServiceImpl.java

@@ -859,7 +859,7 @@ public class SupplierApprovalSecondServiceImpl extends ServiceImpl<SupplierAppro
                 }
             }
         }
-        BigDecimal supplierScoreMax = SupplierScoringModel.ENTERPRISE_FINANCE_RATIO.multiply(SupplierScoringModel.SALES_DOCUMENTS_STANDARD_THREE);
+        BigDecimal supplierScoreMax = SupplierScoringModel.ENTERPRISE_FINANCE_RATIO.multiply(SupplierScoringModel.SALES_DOCUMENTS_STANDARD_THREE).multiply(new BigDecimal("2"));
         if (salesScore.compareTo(supplierScoreMax) == 1) {
             scoreTotal = scoreTotal.add(supplierScoreMax);
         } else {

+ 12 - 1
src/main/resources/data/update/v1.0/20231117liutao.sql

@@ -1442,4 +1442,15 @@ alter table supplier_approval_second modify `main_business_income_score` decimal
 alter table supplier_approval_second modify `main_business_cost` decimal(17,4) default NULL COMMENT '主营业务成本';
 alter table supplier_approval_second modify `main_business_profit` decimal(17,4) default NULL COMMENT '毛利率';
 alter table supplier_approval_second modify `main_business_profit_score` decimal(17,4) default NULL COMMENT '毛利率得分';
-alter table supplier_approval_second modify `business_address` varchar(500) default NULL COMMENT '经营地址';
+alter table supplier_approval_second modify `business_address` varchar(500) default NULL COMMENT '经营地址';
+
+
+alter table t_dictionary set name = '本级、事业单位' where code = 'equityHierarchyDetail_2_A';
+alter table t_dictionary set name = '民营公司' where code = 'equityHierarchyDetail_2_F';
+
+INSERT INTO `t_dictionary`(`name`, `parentId`, `code`, `value`, `gradation`, `gmt_create`, `gmt_modified`)
+VALUES ('民营主板、科创板上市公司', (select t.id from t_dictionary t where t.code = 'holdingRatio'), 'holdingRatio_4', NULL, 0, now(), now());
+INSERT INTO `t_dictionary`(`name`, `parentId`, `code`, `value`, `gradation`, `gmt_create`, `gmt_modified`)
+VALUES ('事业单位', (select t.id from t_dictionary t where t.code = 'holdingRatio'), 'holdingRatio_5', NULL, 1, now(), now());
+INSERT INTO `t_dictionary`(`name`, `parentId`, `code`, `value`, `gradation`, `gmt_create`, `gmt_modified`)
+VALUES ('民营非上市公司', (select t.id from t_dictionary t where t.code = 'holdingRatio'), 'holdingRatio_6', NULL, 2, now(), now());