build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'com.inkasso'
-version = '1.0.35-prod'
+version = '1.0.37-prod'
 sourceCompatibility = '1.8'
 
 configurations {

src/main/java/com/inkasso/factoring/creditmanagement/service/impl/ProjectInformationServiceImpl.java

@@ -261,16 +261,17 @@ public class ProjectInformationServiceImpl extends ServiceImpl<ProjectInformatio
         ProjectCoreEnterprise projectCoreEnterprise = projectInformation.getProjectCoreEnterprise();
         if (projectCoreEnterprise != null) {
             //核心企业企查查
-            Enterprise coreEnterprise = enterpriseService.getById(projectCoreEnterprise.getcEnterpriseId());
-            List<String> coreErrors = qichacha(null, coreEnterprise, projectCoreEnterprise);
-            coreEnterprise.setErrors(coreErrors);
+            ProjectCoreEnterprise existsProjectCoreEnterprise = projectCoreEnterpriseService.getById(projectCoreEnterprise.getId());
+            Enterprise existsEnterprise = enterpriseService.getById(existsProjectCoreEnterprise.getcEnterpriseId());
+            List<String> coreErrors = qichacha(null, existsEnterprise, projectCoreEnterprise);
+            existsEnterprise.setErrors(coreErrors);
             //业主方
             if (existsProject.getcEnterpriseId() == null) {
                 String projectCoreStatus = projectCoreEnterprise.getStatus();
                 existsProject.setStatus(projectCoreStatus);
                 updateById(existsProject);
             }
-            enterpriseService.updateById(coreEnterprise);
+            enterpriseService.updateById(existsEnterprise);
 
             coreStatus = projectCoreEnterpriseService.getById(projectCoreEnterprise.getId()).getStatus();
             if (!coreStatus.equals(ProjectAndEnterpriseStatusEnums.VOTE.getCode())) {
@@ -671,7 +672,7 @@ public class ProjectInformationServiceImpl extends ServiceImpl<ProjectInformatio
                 if (projectCore.getCentralizedProcurementPlatform() != null && projectCore.getCentralizedProcurementPlatform() == 1 && betweenYear < 2) {
                     error.add(enterprise.getCorporateName() + "集采平台注册时间少于两年");
                     status = ProjectAndEnterpriseStatusEnums.VOTE.getCode();
-                }else if (projectCore.getCentralizedProcurementPlatform() != null && betweenYear < 5) {
+                }else if (projectCore.getCentralizedProcurementPlatform() != null && projectCore.getCentralizedProcurementPlatform() == 0 &&  betweenYear < 5) {
                     error.add(enterprise.getCorporateName() + "注册时间少于五年");
                     status = ProjectAndEnterpriseStatusEnums.VOTE.getCode();
                 }
@@ -681,6 +682,10 @@ public class ProjectInformationServiceImpl extends ServiceImpl<ProjectInformatio
                 }
             }
             projectCore.setStatus(status);
+            if (CollectionUtil.isNotEmpty(error)) {
+                String errorsString = error.stream().collect(Collectors.joining(","));
+                projectCore.setErrorsString(errorsString);
+            }
             projectCoreEnterpriseService.updateById(projectCore);
         }
         if (CollectionUtil.isNotEmpty(error)) {

src/main/java/com/inkasso/factoring/financingmanagement/entity/vo/FinancingApplyListVo.java

@@ -64,6 +64,11 @@ public class FinancingApplyListVo {
      */
     private String financingStatus;
 
+    /**
+     * 是否提交
+     */
+    private Boolean visible;
+
     public String getBusinessNumber() {
         return businessNumber;
     }
@@ -151,4 +156,12 @@ public class FinancingApplyListVo {
     public void setId(Long id) {
         this.id = id;
     }
+
+    public Boolean getVisible() {
+        return visible;
+    }
+
+    public void setVisible(Boolean visible) {
+        this.visible = visible;
+    }
 }

src/main/resources/mapping/financingmanagement/FinancingApplyMapper.xml

@@ -14,6 +14,7 @@
         <result column="financing_amount" property="financingAmount" />
         <result column="financing_status" property="financingStatus" />
         <result column="current_stage" property="currentStage" />
+        <result column="visible" property="visible" />
     </resultMap>
 
     <select id="list" parameterType="com.inkasso.factoring.financingmanagement.entity.vo.FinancingSearch" resultMap="CFinancingBasicInfoResult">
@@ -28,7 +29,8 @@
             t6.platform_name,
             t1.financing_amount,
             t8.name current_stage,
-            t7.name financing_status
+            t7.name financing_status,
+            t1.visible
         FROM c_financing_basic_info t1
             LEFT JOIN review_quota_disburse t2 ON t1.id = t2.c_financing_basic_info_id
             LEFT JOIN review_master_contract t3 ON t2.id = t3.review_quota_disburse_id