feat(供应商)：流程调整

build.gradle

@@ -9,7 +9,7 @@ targetCompatibility = 1.8
 
 jar {
     baseName = 'factoring-trade-prod'
-    version = '1.0.9'
+    version = '1.0.11'
 }
 
 springBoot {

src/main/java/com/sunxung/factoring/service/project/impl/ProjectCoreEnterpriseServiceImpl.java

@@ -287,11 +287,11 @@ public class ProjectCoreEnterpriseServiceImpl extends ServiceImpl<ProjectCoreEnt
         params.put("stCountScore", b.format(enterpriseReport.getStCountScore()));
         params.put("stCountPerson", enterpriseReport.getStCountPerson() == 0 ? "不存在" : "存在");
         params.put("stCountPersonScore", b.format(enterpriseReport.getStCountPersonScore()));
-        params.put("zhiXingAmount", enterpriseReport.getZhiXingAmount().setScale(2, RoundingMode.HALF_UP) + "元人民币");
+        params.put("zhiXingAmount", enterpriseReport.getZhiXingAmount().setScale(2, RoundingMode.HALF_UP) + "万元人民币");
         params.put("zhiXingAmountScore", b.format(enterpriseReport.getZhiXingAmountScore()));
         params.put("zhiXingFrequent", enterpriseReport.getZhiXingFrequent());
         params.put("zhiXingFrequentScore", b.format(enterpriseReport.getZhiXingFrequentScore()));
-        params.put("historicalLitigationAmount", enterpriseReport.getHistoricalLitigationAmount().setScale(2, RoundingMode.HALF_UP) + "元人民币");
+        params.put("historicalLitigationAmount", enterpriseReport.getHistoricalLitigationAmount().setScale(2, RoundingMode.HALF_UP) + "万元人民币");
         params.put("historicalLitigationAmountScore", b.format(enterpriseReport.getHistoricalLitigationAmountScore()));
         params.put("historicalLitigationCount", enterpriseReport.getHistoricalLitigationCount());
         params.put("historicalLitigationCountScore", b.format(enterpriseReport.getHistoricalLitigationCountScore()));
@@ -315,9 +315,9 @@ public class ProjectCoreEnterpriseServiceImpl extends ServiceImpl<ProjectCoreEnt
         params.put("exceptionScore", b.format(enterpriseReport.getExceptionScore()));
         params.put("administrativePenaltyCount", enterpriseReport.getAdministrativePenaltyCount());
         params.put("administrativePenaltyCountScore", b.format(enterpriseReport.getAdministrativePenaltyCountScore()));
-        params.put("administrativePenaltyAmount", enterpriseReport.getAdministrativePenaltyAmount().setScale(2, RoundingMode.HALF_UP) + "元人民币");
+        params.put("administrativePenaltyAmount", enterpriseReport.getAdministrativePenaltyAmount().setScale(2, RoundingMode.HALF_UP) + "万元人民币");
         params.put("administrativePenaltyAmountScore", b.format(enterpriseReport.getAdministrativePenaltyAmountScore()));
-        params.put("environmentalPenaltiesAmount", enterpriseReport.getEnvironmentalPenaltiesAmount().setScale(2, RoundingMode.HALF_UP) + "元人民币");
+        params.put("environmentalPenaltiesAmount", enterpriseReport.getEnvironmentalPenaltiesAmount().setScale(2, RoundingMode.HALF_UP) + "万元人民币");
         params.put("environmentalPenaltiesAmountScore", b.format(enterpriseReport.getEnvironmentalPenaltiesAmountScore()));
         params.put("news", enterpriseReport.getNews() == 0 ? "不存在" : "存在");
         params.put("newsScore", b.format(enterpriseReport.getNewsScore()));

src/main/java/com/sunxung/factoring/service/project/impl/ProjectInformationServiceImpl.java

@@ -317,11 +317,11 @@ public class ProjectInformationServiceImpl extends ServiceImpl<ProjectInformatio
         params.put("stCountScore", b.format(projectReport.getStCountScore()));
         params.put("stCountPerson", projectReport.getStCountPerson() == 0 ? "不存在" : "存在");
         params.put("stCountPersonScore", b.format(projectReport.getStCountPersonScore()));
-        params.put("zhiXingAmount", projectReport.getZhiXingAmount().setScale(2, RoundingMode.HALF_UP) + "元人民币");
+        params.put("zhiXingAmount", projectReport.getZhiXingAmount().setScale(2, RoundingMode.HALF_UP) + "万元人民币");
         params.put("zhiXingAmountScore", b.format(projectReport.getZhiXingAmountScore()));
         params.put("zhiXingFrequent", projectReport.getZhiXingFrequent());
         params.put("zhiXingFrequentScore", b.format(projectReport.getZhiXingFrequentScore()));
-        params.put("historicalLitigationAmount", projectReport.getHistoricalLitigationAmount().setScale(2, RoundingMode.HALF_UP) + "元人民币");
+        params.put("historicalLitigationAmount", projectReport.getHistoricalLitigationAmount().setScale(2, RoundingMode.HALF_UP) + "万元人民币");
         params.put("historicalLitigationAmountScore", b.format(projectReport.getHistoricalLitigationAmountScore()));
         params.put("historicalLitigationCount", projectReport.getHistoricalLitigationCount());
         params.put("historicalLitigationCountScore", b.format(projectReport.getHistoricalLitigationCountScore()));
@@ -345,9 +345,9 @@ public class ProjectInformationServiceImpl extends ServiceImpl<ProjectInformatio
         params.put("exceptionScore", b.format(projectReport.getExceptionScore()));
         params.put("administrativePenaltyCount", projectReport.getAdministrativePenaltyCount());
         params.put("administrativePenaltyCountScore", b.format(projectReport.getAdministrativePenaltyCountScore()));
-        params.put("administrativePenaltyAmount", projectReport.getAdministrativePenaltyAmount().setScale(2, RoundingMode.HALF_UP) + "元人民币");
+        params.put("administrativePenaltyAmount", projectReport.getAdministrativePenaltyAmount().setScale(2, RoundingMode.HALF_UP) + "万元人民币");
         params.put("administrativePenaltyAmountScore", b.format(projectReport.getAdministrativePenaltyAmountScore()));
-        params.put("environmentalPenaltiesAmount", projectReport.getEnvironmentalPenaltiesAmount().setScale(2, RoundingMode.HALF_UP) + "元人民币");
+        params.put("environmentalPenaltiesAmount", projectReport.getEnvironmentalPenaltiesAmount().setScale(2, RoundingMode.HALF_UP) + "万元人民币");
         params.put("environmentalPenaltiesAmountScore", b.format(projectReport.getEnvironmentalPenaltiesAmountScore()));
         params.put("news", projectReport.getNews() == 0 ? "不存在" : "存在");
         params.put("newsScore", b.format(projectReport.getNewsScore()));

src/main/java/com/sunxung/factoring/service/supplier/impl/SupplierApprovalFirstServiceImpl.java

@@ -138,18 +138,18 @@ public class SupplierApprovalFirstServiceImpl extends ServiceImpl<SupplierApprov
         SupplierApprovalFirst supplierApprovalFirst = lambdaQuery().eq(SupplierApprovalFirst::getcSupplierInfoId, supplierInfo.getId()).eq(SupplierApprovalFirst::getVisible, false).one();
         Enterprise guaranteeEnterprise = supplierInfo.getGuaranteeEnterprise();
         Enterprise enterprise = supplierInfo.getEnterprise();
+        //保存第一步审核结论
+        if (supplierApprovalFirst == null) {
+            supplierApprovalFirst = new SupplierApprovalFirst();
+        }
+        supplierApprovalFirst.setcSupplierInfoId(supplierInfo.getId());
+        supplierApprovalFirst.setVisible(supplierInfo.getVisible());
+        supplierApprovalFirst.setApprovalComment(supplierInfo.getApprovalComment());
+        supplierApprovalFirst.setApprovalConclusion(supplierInfo.getApprovalConclusion());
+        supplierApprovalFirst.setcSupplierInfoHistoryId(supplierInfo.getHistoryId());
+        saveOrUpdate(supplierApprovalFirst);
+        supplierInfo.setSupplierApprovalFirst(supplierApprovalFirst);
         if (StringUtils.isEmpty(supplierInfo.getApprovalConclusion()) || supplierInfo.getApprovalConclusion().equals(ConstantConversionUtil.APPROVAL_RESULT_PASS)) {
-            //保存第一步审核结论
-            if (supplierApprovalFirst == null) {
-                supplierApprovalFirst = new SupplierApprovalFirst();
-            }
-            supplierApprovalFirst.setcSupplierInfoId(supplierInfo.getId());
-            supplierApprovalFirst.setVisible(supplierInfo.getVisible());
-            supplierApprovalFirst.setApprovalComment(supplierInfo.getApprovalComment());
-            supplierApprovalFirst.setApprovalConclusion(supplierInfo.getApprovalConclusion());
-            supplierApprovalFirst.setcSupplierInfoHistoryId(supplierInfo.getHistoryId());
-            saveOrUpdate(supplierApprovalFirst);
-            supplierInfo.setSupplierApprovalFirst(supplierApprovalFirst);
             //保存企业审核信息
             saveInfo(enterprise, supplierApprovalFirst.getId(), supplierInfo.getId());
             //保存担保企业审核信息