浏览代码

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

liutao 7 月之前
父节点
当前提交
e2588a4b34

+ 2 - 1
src/main/java/com/sunxung/factoring/service/project/impl/ProjectCoreEnterpriseServiceImpl.java

@@ -24,6 +24,7 @@ import com.sunxung.factoring.service.supplier.IDueDiligenceAllocationService;
 import com.sunxung.factoring.service.sys.*;
 import com.sunxung.factoring.service.sys.flowable.FlowableService;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -209,7 +210,7 @@ public class ProjectCoreEnterpriseServiceImpl extends ServiceImpl<ProjectCoreEnt
                     projectCoreEnterprise.setAssigner(user.getName());
                 }
             }
-            if(projectCoreEnterprise.getCoreStatusStr().equals("补充信息")){
+            if(StringUtils.isNotEmpty(projectCoreEnterprise.getCoreStatusStr()) && projectCoreEnterprise.getCoreStatusStr().equals("补充信息")){
                 projectCoreEnterprise.setAssigner("C端用户");
             }
         }

+ 2 - 1
src/main/java/com/sunxung/factoring/service/project/impl/ProjectInformationServiceImpl.java

@@ -25,6 +25,7 @@ import com.sunxung.factoring.service.supplier.IDueDiligenceAllocationService;
 import com.sunxung.factoring.service.sys.*;
 import com.sunxung.factoring.service.sys.flowable.FlowableService;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -190,7 +191,7 @@ public class ProjectInformationServiceImpl extends ServiceImpl<ProjectInformatio
                     projectInformation.setAssigner(user.getName());
                 }
             }
-            if(projectInformation.getStatusStr().equals("补充信息")){
+            if(StringUtils.isNotEmpty(projectInformation.getStatusStr()) && projectInformation.getStatusStr().equals("补充信息")){
                 projectInformation.setAssigner("C端用户");
             }
         }

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

@@ -837,10 +837,11 @@ public class SupplierApprovalSecondServiceImpl extends ServiceImpl<SupplierAppro
             incomeScore = SupplierScoringModel.ENTERPRISE_FINANCE_RATIO.multiply(SupplierScoringModel.ENTERPRISE_CORPORATE_FINANCE_STANDARD_TWO);
         }
         supplierApprovalSecond.setMainBusinessIncomeScore(incomeScore);
+        BigDecimal mainBusinessProfitScore = BigDecimal.ZERO;
         if (supplierApprovalSecond.getMainBusinessProfit().compareTo(new BigDecimal("3")) > -1) {
-            BigDecimal mainBusinessProfitScore = SupplierScoringModel.ENTERPRISE_FINANCE_RATIO.multiply(SupplierScoringModel.ENTERPRISE_CORPORATE_FINANCE_STANDARD_THREE);
-            supplierApprovalSecond.setMainBusinessProfitScore(mainBusinessProfitScore);
+            mainBusinessProfitScore = SupplierScoringModel.ENTERPRISE_FINANCE_RATIO.multiply(SupplierScoringModel.ENTERPRISE_CORPORATE_FINANCE_STANDARD_THREE);
         }
+        supplierApprovalSecond.setMainBusinessProfitScore(mainBusinessProfitScore);
         String incomeLevel;
         if (supplierApprovalSecond.getMainBusinessIncome().compareTo(new BigDecimal("50000000")) == -1) {
             incomeLevel = SupplierScoringModel.INCOME_LEVEL_E;