From 276ee3104c1b3207ff7823008313baec79c4d9d8 Mon Sep 17 00:00:00 2001 From: liangqitao <12345678> Date: Mon, 17 Jan 2022 17:13:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#47375?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/impl/ProjectDetailServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java index 7249940e..e6f5634a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java @@ -35,6 +35,7 @@ import com.jero.project.entity.PayWorkingGroupDistributionRecord; import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.service.IPayWorkingGroupDistributionRecordService; import com.jero.project.service.IPayWorkingGroupSubItemService; +import com.jero.temporary.common.PayCompanyManagementTemporaryCommon; import com.jero.temporary.entity.PayCompanyManagementTemporary; import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayCompanyManagementTemporaryService; @@ -43,6 +44,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; + import javax.annotation.Resource; import java.math.BigDecimal; import java.util.List; @@ -182,7 +184,12 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { if(Objects.isNull(payCompanyManagement)){ throw new JeroBootException("企业不存在!"); } - projectDetailVO.setCompanyName(payCompanyManagement.getCompanyName()); + if(Objects.equals(payCompanyManagement.getStatus(), PayCompanyManagementTemporaryCommon.STATUS2)){ + projectDetailVO.setCompanyName(payCompanyManagement.getCompanyName() + PayCompanyManagementTemporaryCommon.CHECK); + }else{ + projectDetailVO.setCompanyName(payCompanyManagement.getCompanyName()); + } + projectDetailVO.setPostalCodeCompany(payCompanyManagement.getPostalCode()); projectDetailVO.setCompanyAddress(payCompanyManagement.getCompanyAddress()); PayContactsManagement payContactsManagement = payContactsManagementService.getById(payCommonProject.getContactsTemporaryId());