修改bug#47375
This commit is contained in:
+8
-1
@@ -35,6 +35,7 @@ import com.jero.project.entity.PayWorkingGroupDistributionRecord;
|
|||||||
import com.jero.project.entity.PayWorkingGroupSubItem;
|
import com.jero.project.entity.PayWorkingGroupSubItem;
|
||||||
import com.jero.project.service.IPayWorkingGroupDistributionRecordService;
|
import com.jero.project.service.IPayWorkingGroupDistributionRecordService;
|
||||||
import com.jero.project.service.IPayWorkingGroupSubItemService;
|
import com.jero.project.service.IPayWorkingGroupSubItemService;
|
||||||
|
import com.jero.temporary.common.PayCompanyManagementTemporaryCommon;
|
||||||
import com.jero.temporary.entity.PayCompanyManagementTemporary;
|
import com.jero.temporary.entity.PayCompanyManagementTemporary;
|
||||||
import com.jero.temporary.entity.PayContactsManagementTemporary;
|
import com.jero.temporary.entity.PayContactsManagementTemporary;
|
||||||
import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
|
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.commons.lang3.StringUtils;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -182,7 +184,12 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
|
|||||||
if(Objects.isNull(payCompanyManagement)){
|
if(Objects.isNull(payCompanyManagement)){
|
||||||
throw new JeroBootException("企业不存在!");
|
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.setPostalCodeCompany(payCompanyManagement.getPostalCode());
|
||||||
projectDetailVO.setCompanyAddress(payCompanyManagement.getCompanyAddress());
|
projectDetailVO.setCompanyAddress(payCompanyManagement.getCompanyAddress());
|
||||||
PayContactsManagement payContactsManagement = payContactsManagementService.getById(payCommonProject.getContactsTemporaryId());
|
PayContactsManagement payContactsManagement = payContactsManagementService.getById(payCommonProject.getContactsTemporaryId());
|
||||||
|
|||||||
Reference in New Issue
Block a user