소스 검색

Merge remote-tracking branch 'origin/dev1.0' into dev1.0

zhangc 7 달 전
부모
커밋
5e2b58e378

+ 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);

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

@@ -463,8 +463,8 @@ public class SupplierApprovalSecondServiceImpl extends ServiceImpl<SupplierAppro
             String city = areaJS.getStr("city");
             if (province.contains("广东") || province.contains("江苏")) {
                 if (city.contains("深圳") || city.contains("广州") || city.contains("佛山") || city.contains("东莞")
-                        || city.contains("东莞") || city.contains("东莞") || city.contains("东莞")
-                        || city.contains("东莞") || city.contains("东莞") || city.contains("东莞")) {
+                        || city.contains("苏州") || city.contains("南京") || city.contains("常州")
+                        || city.contains("无锡") || city.contains("南通") || city.contains("徐州")) {
                     registeredAddressScore = SupplierScoringModel.ENTERPRISE_RATIO.multiply(SupplierScoringModel.REGISTERED_ADDRESS_STANDARD_ONE);
                 } else {
                     registeredAddressScore = SupplierScoringModel.ENTERPRISE_RATIO.multiply(SupplierScoringModel.REGISTERED_ADDRESS_STANDARD_TWO);
@@ -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 {
@@ -869,8 +869,8 @@ public class SupplierApprovalSecondServiceImpl extends ServiceImpl<SupplierAppro
         BigDecimal businessAddressScore = BigDecimal.ZERO;
         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("东莞")) {
+                    || businessAddress.contains("苏州") || businessAddress.contains("南京") || businessAddress.contains("常州")
+                    || businessAddress.contains("无锡") || businessAddress.contains("南通") || businessAddress.contains("徐州")) {
                 businessAddressScore = SupplierScoringModel.ENTERPRISE_RATIO.multiply(SupplierScoringModel.REGISTERED_ADDRESS_STANDARD_ONE);
             } else {
                 businessAddressScore = SupplierScoringModel.ENTERPRISE_RATIO.multiply(SupplierScoringModel.REGISTERED_ADDRESS_STANDARD_TWO);

+ 11 - 0
src/main/java/com/sunxung/factoring/web/creditresolution/CreditResolutionController.java

@@ -1,5 +1,7 @@
 package com.sunxung.factoring.web.creditresolution;
 
+import com.sunxung.factoring.component.annotation.OperationLog;
+import com.sunxung.factoring.component.enums.OperationTypeEnum;
 import com.sunxung.factoring.entity.GridPage;
 import com.sunxung.factoring.entity.ResponseJson;
 import com.sunxung.factoring.entity.creditresolution.CreditResolution;
@@ -45,6 +47,7 @@ public class CreditResolutionController {
      * @param id
      */
     @RequestMapping("auto")
+    @OperationLog(operationModule = "授信决议",operationType = OperationTypeEnum.INSERT,description = "手动同步sop接口")
     public void test(@RequestParam Long id){
         creditResolutionApprovalService.test(id);
 
@@ -55,6 +58,7 @@ public class CreditResolutionController {
      * @param id
      */
     @RequestMapping("startProcess")
+    @OperationLog(operationModule = "授信决议",operationType = OperationTypeEnum.INSERT,description = "手动开启流程")
     public void startProcess(@RequestParam Long id){
         creditResolutionService.startProcess(id);
     }
@@ -64,6 +68,7 @@ public class CreditResolutionController {
      * @return
      */
     @RequestMapping("allList")
+    @OperationLog(operationModule = "授信决议",operationType = OperationTypeEnum.QUERY,description = "全部列表")
     public GridPage allList(@RequestBody SearchBusinessProcessingTask search){
         GridPage<CreditResolution> page = creditResolutionService.allList(search);
         return page;
@@ -76,6 +81,7 @@ public class CreditResolutionController {
      * @return
      */
     @RequestMapping("get")
+    @OperationLog(operationModule = "授信决议",operationType = OperationTypeEnum.QUERY,description = "获取授信决议信息")
     public ResponseJson getInfo(@RequestParam Long id) {
         CreditResolution creditResolution = creditResolutionService.get(id);
         creditResolution.setFinancingRatioLow(format(creditResolution.getFinancingRatioLow() == null? 0: creditResolution.getFinancingRatioLow() * 100));
@@ -109,6 +115,7 @@ public class CreditResolutionController {
      * @return
      */
     @RequestMapping("getDetail")
+    @OperationLog(operationModule = "授信决议",operationType = OperationTypeEnum.QUERY,description = "获取授信决议录入页信息")
     public ResponseJson getDetail(@RequestParam Long id) {
         CreditResolution creditResolution = creditResolutionService.getDetail(id);
         return new ResponseJson(creditResolution);
@@ -120,6 +127,7 @@ public class CreditResolutionController {
      * @return
      */
     @RequestMapping("add")
+    @OperationLog(operationModule = "授信决议",operationType = OperationTypeEnum.INSERT,description = "授信决议录入")
     public ResponseJson addInfo(@RequestBody CreditResolution creditResolution) {
         creditResolutionService.addInfo(creditResolution);
         return new ResponseJson();
@@ -131,6 +139,7 @@ public class CreditResolutionController {
      * @return
      */
     @RequestMapping("/confirm/add")
+    @OperationLog(operationModule = "授信决议",operationType = OperationTypeEnum.INSERT,description = "授信决议确认")
     public ResponseJson creditResolutionConfirm(@RequestBody CreditResolution creditResolution) {
         creditResolutionApprovalService.addInfo(creditResolution);
         return new ResponseJson();
@@ -143,6 +152,7 @@ public class CreditResolutionController {
      * @return
      */
     @RequestMapping("reconsider/add")
+    @OperationLog(operationModule = "授信决议",operationType = OperationTypeEnum.INSERT,description = "复议调整申请")
     public ResponseJson addReconsiderAdjustInfo(@RequestBody ReconsiderAdjust reconsiderAdjust) {
         reconsiderAdjustService.add(reconsiderAdjust);
         return new ResponseJson();
@@ -155,6 +165,7 @@ public class CreditResolutionController {
      * @return
      */
     @RequestMapping("reconsider/approval/add")
+    @OperationLog(operationModule = "授信决议",operationType = OperationTypeEnum.INSERT,description = "复议调整审批")
     public ResponseJson approval(@RequestBody ReconsiderAdjustApproval approval) {
         reconsiderAdjustApprovalService.add(approval);
         return new ResponseJson();

+ 16 - 0
src/main/java/com/sunxung/factoring/web/project/ProjectInformationController.java

@@ -1,5 +1,7 @@
 package com.sunxung.factoring.web.project;
 
+import com.sunxung.factoring.component.annotation.OperationLog;
+import com.sunxung.factoring.component.enums.OperationTypeEnum;
 import com.sunxung.factoring.entity.GridPage;
 import com.sunxung.factoring.entity.ResponseJson;
 import com.sunxung.factoring.entity.project.*;
@@ -42,6 +44,7 @@ public class ProjectInformationController {
      * @return
      */
     @RequestMapping("project/getAllProject")
+    @OperationLog(operationModule = "项目授信",operationType = OperationTypeEnum.QUERY,description = "查询所有项目授信")
     public GridPage getAllProject(@RequestBody SearchBusinessProcessingTask search){
         GridPage<ProjectInformation> list = projectInformationService.findAll(search);
         return list;
@@ -53,6 +56,7 @@ public class ProjectInformationController {
      * @return
      */
     @RequestMapping("project/getAllCoreEnterprise")
+    @OperationLog(operationModule = "核心企业授信",operationType = OperationTypeEnum.QUERY,description = "查询所有核心企业授信")
     public GridPage getAllCoreEnterprise(@RequestBody SearchBusinessProcessingTask search){
         GridPage<ProjectCoreEnterprise> page = projectCoreEnterpriseService.findAll(search);
         return page;
@@ -63,6 +67,7 @@ public class ProjectInformationController {
      * @return
      */
     @RequestMapping("api/startProjectProcess")
+    @OperationLog(operationModule = "项目授信",operationType = OperationTypeEnum.INSERT,description = "开启项目流程")
     public ResponseJson startProjectProcess(@RequestBody ProjectInformation projectInformation){
         projectInformationService.startProjectProcess(projectInformation);
         return new ResponseJson();
@@ -73,6 +78,7 @@ public class ProjectInformationController {
      * @return
      */
     @RequestMapping("api/startProjectCoreEnterpriseProcess")
+    @OperationLog(operationModule = "核心企业授信",operationType = OperationTypeEnum.INSERT,description = "开启项目核心企业流程")
     public ResponseJson startProjectCoreEnterpriseProcess(@RequestBody ProjectInformation projectInformation){
         projectCoreEnterpriseService.startProjectProcess(projectInformation);
         return new ResponseJson();
@@ -84,6 +90,7 @@ public class ProjectInformationController {
      * @return
      */
     @RequestMapping("project/getProjectAuditInfo")
+    @OperationLog(operationModule = "项目授信",operationType = OperationTypeEnum.QUERY,description = "获取项目审核信息")
     public ResponseJson getProjectAuditInfo(@RequestParam Long id){
         ProjectAudit projectAuditInfo = projectAuditService.getProjectAuditInfo(id);
         return new ResponseJson(projectAuditInfo);
@@ -95,6 +102,7 @@ public class ProjectInformationController {
      * @return
      */
     @RequestMapping("project/getProjectCoreEnterpriseAuditInfo")
+    @OperationLog(operationModule = "核心企业授信",operationType = OperationTypeEnum.QUERY,description = "获取项目核心企业审核信息")
     public ResponseJson getProjectCoreEnterpriseAuditInfo(@RequestParam Long id){
         ProjectCoreEnterpriseAudit projectCoreEnterpriseAuditInfo = projectCoreEnterpriseAuditService.getProjectCoreEnterpriseAuditInfo(id);
         return new ResponseJson(projectCoreEnterpriseAuditInfo);
@@ -107,6 +115,7 @@ public class ProjectInformationController {
      * @return
      */
     @RequestMapping("project/addProjectAuditInfo")
+    @OperationLog(operationModule = "项目授信",operationType = OperationTypeEnum.INSERT,description = "保存项目审核信息")
     public ResponseJson addProjectAuditInfo(@RequestBody ProjectAudit projectAuditInfo){
         projectAuditService.addProjectAuditInfo(projectAuditInfo);
         return new ResponseJson();
@@ -118,6 +127,7 @@ public class ProjectInformationController {
      * @return
      */
     @RequestMapping("project/addProjectCoreEnterpriseAuditInfo")
+    @OperationLog(operationModule = "核心企业授信",operationType = OperationTypeEnum.INSERT,description = "保存项目核心企业审核信息")
     public ResponseJson addProjectCoreEnterpriseAuditInfo(@RequestBody ProjectCoreEnterpriseAudit projectCoreEnterpriseAuditInfo){
         projectCoreEnterpriseAuditService.addProjectCoreEnterpriseAuditInfo(projectCoreEnterpriseAuditInfo);
         return new ResponseJson();
@@ -129,6 +139,7 @@ public class ProjectInformationController {
      * @return
      */
     @RequestMapping("project/addProjectCoreEnterprise/measurement")
+    @OperationLog(operationModule = "核心企业授信",operationType = OperationTypeEnum.QUERY,description = "一键测算")
     public ResponseJson measurement(@RequestBody ProjectCoreEnterpriseAudit projectCoreEnterpriseAuditInfo){
         ProjectCoreEnterpriseComprehensiveEvaluation measurement = projectCoreEnterpriseAuditService.measurement(null,projectCoreEnterpriseAuditInfo);
         return new ResponseJson(measurement);
@@ -140,6 +151,7 @@ public class ProjectInformationController {
      * @return
      */
     @RequestMapping("project/addProject/measurement")
+    @OperationLog(operationModule = "项目授信",operationType = OperationTypeEnum.QUERY,description = "一键测算")
     public ResponseJson measurement(@RequestBody ProjectAudit projectAudit){
         ProjectOwnerComprehensiveEvaluation measurement = projectAuditService.measurement(null,projectAudit);
         return new ResponseJson(measurement);
@@ -151,6 +163,7 @@ public class ProjectInformationController {
      * @return
      */
     @RequestMapping("project/admission/report")
+    @OperationLog(operationModule = "项目授信",operationType = OperationTypeEnum.QUERY,description = "获取项目准入报告")
     public ResponseJson getProjectReport(@RequestParam Long id){
         ProjectOwnerScore projectOwnerScore = projectInformationService.getProjectReport(id);
         return new ResponseJson(projectOwnerScore);
@@ -162,6 +175,7 @@ public class ProjectInformationController {
      * @return
      */
     @RequestMapping("enterprise/admission/report")
+    @OperationLog(operationModule = "核心企业授信",operationType = OperationTypeEnum.QUERY,description = "获取核心企业准入报告")
     public ResponseJson getEnterpriseReport(@RequestParam Long id){
         ProjectCoreEnterpriseScore projectCoreEnterpriseScore = projectCoreEnterpriseService.getEnterpriseReport(id);
         return new ResponseJson(projectCoreEnterpriseScore);
@@ -173,6 +187,7 @@ public class ProjectInformationController {
      * @param res
      */
     @RequestMapping("/enterprise/admission/report/download")
+    @OperationLog(operationModule = "核心企业授信",operationType = OperationTypeEnum.QUERY,description = "下载核心企业准入报告")
     public void downloadEnterpriseReport(@RequestParam Long id, HttpServletResponse res) throws IOException {
         projectCoreEnterpriseService.download(id,res);
     }
@@ -183,6 +198,7 @@ public class ProjectInformationController {
      * @param res
      */
     @RequestMapping("/project/admission/report/download")
+    @OperationLog(operationModule = "项目授信",operationType = OperationTypeEnum.QUERY,description = "下载项目准入报告")
     public void downloadProjectReport(@RequestParam Long id, HttpServletResponse res) throws IOException {
         projectInformationService.download(id,res);
     }

+ 20 - 0
src/main/java/com/sunxung/factoring/web/supplier/SupplierController.java

@@ -1,5 +1,7 @@
 package com.sunxung.factoring.web.supplier;
 
+import com.sunxung.factoring.component.annotation.OperationLog;
+import com.sunxung.factoring.component.enums.OperationTypeEnum;
 import com.sunxung.factoring.entity.GridPage;
 import com.sunxung.factoring.entity.ResponseJson;
 import com.sunxung.factoring.entity.entprise.Enterprise;
@@ -53,6 +55,7 @@ public class SupplierController {
      * @return
      */
     @RequestMapping("api/supplier/startProcess")
+    @OperationLog(operationModule = "供应商授信",operationType = OperationTypeEnum.INSERT,description = "开启流程")
     public ResponseJson startProcess(@RequestBody SupplierInfo supplierInfo){
         String status = supplierInfoService.startProcess(supplierInfo);
         return new ResponseJson(status);
@@ -64,6 +67,7 @@ public class SupplierController {
      * @return
      */
     @RequestMapping("supplier/getAll")
+    @OperationLog(operationModule = "供应商授信",operationType = OperationTypeEnum.QUERY,description = "根据条件查询数据")
     public GridPage getAll(@RequestBody SearchBusinessProcessingTask search){
         GridPage<SupplierInfo> page = supplierInfoService.getBySearch(search);
         return page;
@@ -75,6 +79,7 @@ public class SupplierController {
      * @return
      */
     @RequestMapping("supplier/getDueDiligenceAllocation")
+    @OperationLog(operationModule = "供应商授信",operationType = OperationTypeEnum.QUERY,description = "获取尽调分配信息")
     public ResponseJson getDueDiligenceAllocation(@RequestParam Long id){
         DueDiligenceAllocation dueDiligenceAllocation = dueDiligenceAllocationService.getDueDiligenceAllocation(id);
         return new ResponseJson(dueDiligenceAllocation);
@@ -86,6 +91,7 @@ public class SupplierController {
      * @return
      */
     @RequestMapping("supplier/dueDiligenceAllocation")
+    @OperationLog(operationModule = "供应商授信",operationType = OperationTypeEnum.INSERT,description = "尽调分配")
     public ResponseJson dueDiligenceAllocation(@RequestBody DueDiligenceAllocation dueDiligenceAllocation){
         SupplierInfo supplierInfo = supplierInfoService.get(dueDiligenceAllocation.getcSupplierInfoId());
         Enterprise enterprise = enterpriseService.getById(supplierInfo.getcEnterpriseId());
@@ -102,6 +108,7 @@ public class SupplierController {
      * @return
      */
     @RequestMapping("supplier/getFirstReviewById")
+    @OperationLog(operationModule = "供应商授信",operationType = OperationTypeEnum.QUERY,description = "获取第一步审核信息")
     public ResponseJson getFirstReviewById(@RequestParam Long id){
         SupplierInfo supplierInfo = supplierApprovalFirstService.getFirstReviewById(id);
         return new ResponseJson(supplierInfo);
@@ -112,6 +119,7 @@ public class SupplierController {
      * @return
      */
     @RequestMapping("supplier/firstReview/measurement")
+    @OperationLog(operationModule = "供应商授信",operationType = OperationTypeEnum.OTHER,description = "审核第一步测算")
     public ResponseJson firstMeasurement(@RequestBody SupplierInfo supplierInfo){
         SupplierApprovalFirst measurement = supplierApprovalFirstService.measurement(supplierInfo);
         return new ResponseJson(measurement);
@@ -122,6 +130,7 @@ public class SupplierController {
      * @return
      */
     @RequestMapping("supplier/firstReview")
+    @OperationLog(operationModule = "供应商授信",operationType = OperationTypeEnum.INSERT,description = "审核第一步")
     public ResponseJson firstReview(@RequestBody SupplierInfo supplierInfo){
         supplierApprovalFirstService.firstReview(supplierInfo);
         return new ResponseJson();
@@ -133,6 +142,7 @@ public class SupplierController {
      * @return
      */
     @RequestMapping("supplier/getSecondReviewById")
+    @OperationLog(operationModule = "供应商授信",operationType = OperationTypeEnum.QUERY,description = "获取第二步审核信息")
     public ResponseJson getSecondReviewById(@RequestParam Long id){
         SupplierApprovalSecond supplierApprovalSecond = supplierApprovalSecondService.getSecondReviewById(id);
         return new ResponseJson(supplierApprovalSecond);
@@ -144,6 +154,7 @@ public class SupplierController {
      * @return
      */
     @RequestMapping("supplier/secondReview/measurement")
+    @OperationLog(operationModule = "供应商授信",operationType = OperationTypeEnum.QUERY,description = "第二步审核测算打分")
     public ResponseJson secondMeasurement(@RequestBody SupplierApprovalSecond supplierApprovalSecond){
         SupplierApprovalSecond result = supplierApprovalSecondService.measurement(supplierApprovalSecond);
         return new ResponseJson(result);
@@ -155,6 +166,7 @@ public class SupplierController {
      * @return
      */
     @RequestMapping("supplier/secondReview")
+    @OperationLog(operationModule = "供应商授信",operationType = OperationTypeEnum.INSERT,description = "第二步审核")
     public ResponseJson secondReview(@RequestBody SupplierApprovalSecond supplierApprovalSecond){
         supplierApprovalSecondService.secondReview(supplierApprovalSecond);
         return new ResponseJson();
@@ -167,6 +179,7 @@ public class SupplierController {
      * @return
      */
     @RequestMapping("api/supplier/completeVideoDueDiligenceAppointment")
+    @OperationLog(operationModule = "供应商授信",operationType = OperationTypeEnum.INSERT,description = "c端完成尽调预约")
     public ResponseJson completeVideoDueDiligenceAppointment(@RequestParam Long id, @RequestParam Long historyId){
         dueDiligenceAppointmentService.completeDueDiligenceAppointment(id,historyId);
         return new ResponseJson();
@@ -177,6 +190,7 @@ public class SupplierController {
      * @return
      */
     @RequestMapping("supplier/getDueDiligenceConfirm")
+    @OperationLog(operationModule = "供应商授信",operationType = OperationTypeEnum.QUERY,description = "获取尽调时间确认信息")
     public ResponseJson getDueDiligenceConfirm(@RequestParam Long supplierId){
         ConfirmationDueDiligenceTime confirmationDueDiligenceTime = confirmationDueDiligenceTimeService.getDueDiligenceConfirm(supplierId);
         return new ResponseJson(confirmationDueDiligenceTime);
@@ -187,6 +201,7 @@ public class SupplierController {
      * @return
      */
     @RequestMapping("supplier/dueDiligenceConfirm")
+    @OperationLog(operationModule = "供应商授信",operationType = OperationTypeEnum.INSERT,description = "尽调时间确认")
     public ResponseJson dueDiligenceConfirm(@RequestBody ConfirmationDueDiligenceTime confirmationDueDiligenceTime){
         confirmationDueDiligenceTimeService.dueDiligenceConfirm(confirmationDueDiligenceTime);
         return new ResponseJson();
@@ -197,6 +212,7 @@ public class SupplierController {
      * @return
      */
     @RequestMapping("supplier/getVideoDueDiligence")
+    @OperationLog(operationModule = "供应商授信",operationType = OperationTypeEnum.QUERY,description = "获取视频尽调信息")
     public ResponseJson getVideoDueDiligence(@RequestParam Long supplierId){
         VideoDueDiligence videoDueDiligence = videoDueDiligenceService.getVideoDueDiligence(supplierId);
         return new ResponseJson(videoDueDiligence);
@@ -207,6 +223,7 @@ public class SupplierController {
      * @return
      */
     @RequestMapping("supplier/videoDueDiligence")
+    @OperationLog(operationModule = "供应商授信",operationType = OperationTypeEnum.INSERT,description = "视频尽调录入")
     public ResponseJson videoDueDiligence(@RequestBody VideoDueDiligence videoDueDiligence){
         videoDueDiligenceService.videoDueDiligence(videoDueDiligence);
         return new ResponseJson();
@@ -218,6 +235,7 @@ public class SupplierController {
      * @return
      */
     @RequestMapping("supplier/video/measurement")
+    @OperationLog(operationModule = "供应商授信",operationType = OperationTypeEnum.QUERY,description = "视频尽调测算打分")
     public ResponseJson videoMeasurement(@RequestBody VideoDueDiligence videoDueDiligence){
         VideoDueDiligence result = videoDueDiligenceService.measurement(videoDueDiligence);
         return new ResponseJson(result);
@@ -229,6 +247,7 @@ public class SupplierController {
      * @return
      */
     @RequestMapping("supplier/report")
+    @OperationLog(operationModule = "供应商授信",operationType = OperationTypeEnum.QUERY,description = "供应商准入报告")
     public ResponseJson report(@RequestParam Long supplierId){
         VideoDueDiligence videoDueDiligence = supplierInfoService.report(supplierId);
         return new ResponseJson(videoDueDiligence);
@@ -240,6 +259,7 @@ public class SupplierController {
      * @return
      */
     @RequestMapping("/supplier/download/report")
+    @OperationLog(operationModule = "供应商授信",operationType = OperationTypeEnum.OTHER,description = "供应商准入报告下载")
     public void downloadReport(@RequestParam Long supplierId, HttpServletResponse response) throws IOException {
         supplierInfoService.downloadReport(supplierId,response);
     }

+ 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());