aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-27 19:32:08 +08:00
parent a34c3bbd56
commit 77ee9ad768
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -411,31 +411,42 @@ public class EmisBaseService {
}
}
return getDestByCountryOrAreaId(country,areaId);
return getDestinationByCountryOrAreaId(country,areaId);
}
public EmisDestination getDestByCountryOrAreaId(String countryCode,Long areaId){
/**
* 根据国家或片区ID 获取目的地
* @param countryCode
* @param areaId
* @return
*/
public EmisDestination getDestinationByCountryOrAreaId(String countryCode,Long areaId){
EmisDestination destination=null;
// 根据大区获取目的网点
EmisDestination queryEmisDestination = new EmisDestination();
queryEmisDestination.setCountryAreaId(areaId);
queryEmisDestination.setStatus(1);
List<EmisDestination> destinationList=emisDestinationMapper.selectEmisDestinationList(queryEmisDestination);
if(!CollectionUtil.isEmpty(destinationList)){
return destinationList.get(0);
}
else{
// 根据国家查询
queryEmisDestination = new EmisDestination();
queryEmisDestination.setCountry(countryCode);
if(areaId!=null) {
EmisDestination queryEmisDestination = new EmisDestination();
queryEmisDestination.setCountryAreaId(areaId);
queryEmisDestination.setStatus(1);
destinationList=emisDestinationMapper.selectEmisDestinationList(queryEmisDestination);
if(!CollectionUtil.isEmpty(destinationList)){
return destinationList.get(0);
List<EmisDestination> destinationList = emisDestinationMapper.selectEmisDestinationList(queryEmisDestination);
if (!CollectionUtil.isEmpty(destinationList)) {
destination=destinationList.get(0);
}
}
return null;
if(destination==null){
// 根据国家查询
EmisDestination queryEmisDestination = new EmisDestination();
queryEmisDestination.setCountry(countryCode);
queryEmisDestination.setStatus(1);
List<EmisDestination> destinationList=emisDestinationMapper.selectEmisDestinationList(queryEmisDestination);
if(!CollectionUtil.isEmpty(destinationList)){
destination=destinationList.get(0);
}
}
return destination;
}