|
|
@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.List; |
|
|
|
import java.util.UUID; |
|
|
|
|
|
|
@ -70,6 +71,7 @@ public class StoreHouseProjectService extends MybatisBaseService<StoreHouseProje |
|
|
|
} |
|
|
|
public List<StoreHouseProjectVo> selectStoreBySid(String sid) { |
|
|
|
List<StoreHouseProjectVo> pagging = baseMapper.selectStoreBySid(sid); |
|
|
|
List<StoreHouseProjectVo> pagging1 = new ArrayList<>(); |
|
|
|
for(StoreHouseProjectVo vo:pagging){ |
|
|
|
String shSid=vo.getShSid(); |
|
|
|
ShStorehouseVo shStorehouseVo=shStorehouseFeign.selectStoreBySid(shSid).getData(); |
|
|
@ -79,9 +81,10 @@ public class StoreHouseProjectService extends MybatisBaseService<StoreHouseProje |
|
|
|
vo.setAddress(shStorehouseVo.getAddress()); |
|
|
|
vo.setLinkerName(shStorehouseVo.getLinkerName()); |
|
|
|
vo.setLinkerPhone(shStorehouseVo.getLinkerPhone()); |
|
|
|
pagging1.add(vo); |
|
|
|
} |
|
|
|
} |
|
|
|
return pagging; |
|
|
|
return pagging1; |
|
|
|
} |
|
|
|
public StoreHouseProjectVo selectProjectByshSid(String sid) { |
|
|
|
StoreHouseProjectVo pagging = baseMapper.selectProjectByshSid(sid); |
|
|
|