Browse Source

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

liutao 7 months ago
parent
commit
989b5b2006

+ 2 - 0
src/main/java/com/sunxung/factoring/service/project/impl/ProjectAuditServiceImpl.java

@@ -545,6 +545,8 @@ public class ProjectAuditServiceImpl extends ServiceImpl<ProjectAuditMapper, Pro
                     }
                     }
                 }else if(businessAddress.contains("海南") || businessAddress.contains("宁夏") || businessAddress.contains("青海") ||businessAddress.contains("西藏")){
                 }else if(businessAddress.contains("海南") || businessAddress.contains("宁夏") || businessAddress.contains("青海") ||businessAddress.contains("西藏")){
                     businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_SEVEN);
                     businessAddressScore = ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_RATIO.multiply(ProjectCoreEnterpriseScoringModel.BUSINESS_ADDRESS_TANDARD_SEVEN);
+                }else {
+                    businessAddressScore = registeredAddressScore;
                 }
                 }
             }
             }
             projectOwnerScore.setBusinessAddressScore(businessAddressScore);
             projectOwnerScore.setBusinessAddressScore(businessAddressScore);

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

@@ -25,6 +25,7 @@ import com.sunxung.factoring.service.supplier.ICEnterpriseHistoryService;
 import com.sunxung.factoring.service.supplier.ISupplierInfoService;
 import com.sunxung.factoring.service.supplier.ISupplierInfoService;
 import com.sunxung.factoring.service.sys.FileService;
 import com.sunxung.factoring.service.sys.FileService;
 import com.sunxung.factoring.service.sys.flowable.FlowableService;
 import com.sunxung.factoring.service.sys.flowable.FlowableService;
+import liquibase.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Bean;
@@ -398,8 +399,14 @@ public class ProjectCoreEnterpriseAuditServiceImpl extends ServiceImpl<ProjectCo
         //经营地址得分
         //经营地址得分
         BigDecimal businessAddressScore = BigDecimal.ZERO;
         BigDecimal businessAddressScore = BigDecimal.ZERO;
         String businessAddress = enterprise.getBusinessAddress();
         String businessAddress = enterprise.getBusinessAddress();
+        //企查查能获取到经营地址,按照经营地址的分;获取不到经营地址的情况按照获取到的注册地址的分?
+        if(StringUtils.isEmpty(businessAddress)){
+            businessAddress = enterprise.getAddress();
+        }
+        List<String> errors = new ArrayList();
         if (businessAddress.contains("黑龙江") || businessAddress.contains("辽宁") || businessAddress.contains("吉林")) {
         if (businessAddress.contains("黑龙江") || businessAddress.contains("辽宁") || businessAddress.contains("吉林")) {
             businessAddressScore = BigDecimal.ZERO;
             businessAddressScore = BigDecimal.ZERO;
+            errors.add("经营地址不准入");
         } else {
         } else {
             if (businessAddress.contains("广东") || businessAddress.contains("江苏")) {
             if (businessAddress.contains("广东") || businessAddress.contains("江苏")) {
                 if (businessAddress.contains("深圳") || businessAddress.contains("广州") || businessAddress.contains("佛山") || businessAddress.contains("东莞")
                 if (businessAddress.contains("深圳") || businessAddress.contains("广州") || businessAddress.contains("佛山") || businessAddress.contains("东莞")
@@ -535,7 +542,6 @@ public class ProjectCoreEnterpriseAuditServiceImpl extends ServiceImpl<ProjectCo
         projectCoreEnterpriseScore.setEnterpriseChangeScore(enterpriseChangeScore);
         projectCoreEnterpriseScore.setEnterpriseChangeScore(enterpriseChangeScore);
         String getProjectCoreEnterpriseScoreUrl = getProjectCoreEnterpriseScore + "?comprehensiveRiskInvestigationId=" + enterprise.getcComprehensiveRiskInvestigationId() + "&dongjiangaoRiskId=" + enterprise.getcDongjiangaoRiskId();
         String getProjectCoreEnterpriseScoreUrl = getProjectCoreEnterpriseScore + "?comprehensiveRiskInvestigationId=" + enterprise.getcComprehensiveRiskInvestigationId() + "&dongjiangaoRiskId=" + enterprise.getcDongjiangaoRiskId();
         ResponseJson forObject = restTemplate.getForObject(getProjectCoreEnterpriseScoreUrl, ResponseJson.class);
         ResponseJson forObject = restTemplate.getForObject(getProjectCoreEnterpriseScoreUrl, ResponseJson.class);
-        List<String> errors = new ArrayList();
         String admitted = ProjectCoreEnterpriseScoringModel.ADMITTED;
         String admitted = ProjectCoreEnterpriseScoringModel.ADMITTED;
         if (forObject != null) {
         if (forObject != null) {
             JSONObject jsonObject = new JSONObject(forObject.getData());
             JSONObject jsonObject = new JSONObject(forObject.getData());
@@ -864,9 +870,6 @@ public class ProjectCoreEnterpriseAuditServiceImpl extends ServiceImpl<ProjectCo
             if (projectCoreEnterpriseScore.getEquityHierarchyScore().compareTo(BigDecimal.ZERO) == 0) {
             if (projectCoreEnterpriseScore.getEquityHierarchyScore().compareTo(BigDecimal.ZERO) == 0) {
                 errors.add("股权层级不准入!");
                 errors.add("股权层级不准入!");
             }
             }
-            if (projectCoreEnterpriseScore.getBusinessAddressScore().compareTo(BigDecimal.ZERO) == 0) {
-                errors.add("经营地址不准入");
-            }
             if (projectCoreEnterpriseScore.getEnterpriseChangeScore().compareTo(BigDecimal.ZERO) == 0) {
             if (projectCoreEnterpriseScore.getEnterpriseChangeScore().compareTo(BigDecimal.ZERO) == 0) {
                 errors.add("企业基本变动信息不准入");
                 errors.add("企业基本变动信息不准入");
             }
             }