|
@@ -248,7 +248,8 @@ public class ProjectAuditServiceImpl extends ServiceImpl<ProjectAuditMapper, Pro
|
|
if(projectInformation.getStatusStr().equals(ProjectAndEnterpriseStatusEnums.CREDIT_SUCCESS.getCode())){
|
|
if(projectInformation.getStatusStr().equals(ProjectAndEnterpriseStatusEnums.CREDIT_SUCCESS.getCode())){
|
|
ProjectCoreEnterprise projectCoreEnterprise = projectCoreEnterpriseService.lambdaQuery().eq(ProjectCoreEnterprise::getcProjectInformationId, projectInformation.getId()).one();
|
|
ProjectCoreEnterprise projectCoreEnterprise = projectCoreEnterpriseService.lambdaQuery().eq(ProjectCoreEnterprise::getcProjectInformationId, projectInformation.getId()).one();
|
|
if(projectCoreEnterprise.getStatusStr().equals(ProjectAndEnterpriseStatusEnums.CREDIT_SUCCESS.getCode())){
|
|
if(projectCoreEnterprise.getStatusStr().equals(ProjectAndEnterpriseStatusEnums.CREDIT_SUCCESS.getCode())){
|
|
- SupplierInfo supplierInfo = supplierInfoService.get(projectInformation.getcSupplierInfoId());
|
|
|
|
|
|
+ ProjectInformation exists = projectInformationService.get(projectInformation.getId());
|
|
|
|
+ SupplierInfo supplierInfo = supplierInfoService.get(exists.getcSupplierInfoId());
|
|
if(supplierInfo.getStatusStr().equals(SupplierStatusEnums.CREDIT_SUCCESS.getCode())){
|
|
if(supplierInfo.getStatusStr().equals(SupplierStatusEnums.CREDIT_SUCCESS.getCode())){
|
|
//开启流程
|
|
//开启流程
|
|
creditResolutionService.startProcess(projectInformation.getId());
|
|
creditResolutionService.startProcess(projectInformation.getId());
|
|
@@ -279,7 +280,7 @@ public class ProjectAuditServiceImpl extends ServiceImpl<ProjectAuditMapper, Pro
|
|
//项目地点得分
|
|
//项目地点得分
|
|
BigDecimal projectAddressScore = BigDecimal.ZERO;
|
|
BigDecimal projectAddressScore = BigDecimal.ZERO;
|
|
String projectAddress = projectInformation.getProjectAddress();
|
|
String projectAddress = projectInformation.getProjectAddress();
|
|
- if (projectAddress.contains("黑龙江") || projectAddress.contains("辽宁") || projectAddress.contains("吉林") || projectAddress.contains("县") || projectAddress.contains("镇") || projectAddress.contains("乡") || projectAddress.contains("村")) {
|
|
|
|
|
|
+ if (projectAddress.contains("黑龙江") || projectAddress.contains("辽宁") || projectAddress.contains("吉林")) {
|
|
errors.add("项目地址不准入!");
|
|
errors.add("项目地址不准入!");
|
|
admitted = ProjectScoringModel.NOT_ADMITTED;
|
|
admitted = ProjectScoringModel.NOT_ADMITTED;
|
|
}else {
|
|
}else {
|