java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge branch 'pre-production'

newStockUp
zhenghaoyu 1 year ago
parent
ef63b8f422 78c5b3c4b0
commit
ad4ab4b0c8
1 changed files with 6 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java

8
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java
Unescape View File

@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.logpm.basic.entity.BasicDelineMiddleEntity; import com.logpm.basic.entity.BasicDelineMiddleEntity;
import com.logpm.basicdata.dto.BasicdataDriverArteryDTO; import com.logpm.basicdata.dto.BasicdataDriverArteryDTO;
import com.logpm.basicdata.entity.*; import com.logpm.basicdata.entity.*;
@ -114,12 +115,15 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
public List<BasicdataDriverArteryVO> getDriverList() { public List<BasicdataDriverArteryVO> getDriverList() {
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if (Func.isEmpty(myCurrentWarehouse)){ if (Func.isEmpty(myCurrentWarehouse)){
log.error("################无当前登录人仓库信息:{}",myCurrentWarehouse); log.error("################getDriverList 无当前登录人仓库信息:{}",myCurrentWarehouse);
return null; return null;
} }
log.info("################ getDriverList 仓库信息:{}",myCurrentWarehouse);
ArrayList<BasicdataDriverArteryVO> basicdataDriverArteryVOS = new ArrayList<>(); ArrayList<BasicdataDriverArteryVO> basicdataDriverArteryVOS = new ArrayList<>();
List<BasicdataDriverArteryEntity> list = this.list(); List<BasicdataDriverArteryEntity> list = this.list();
Stream<BasicdataDriverArteryEntity> basicdataDriverArteryEntityStream = list.stream().filter(l -> l.getWarehouseId().contains(myCurrentWarehouse.getId().toString())); log.info("################getDriverList list:{}",list);
//Stream<BasicdataDriverArteryEntity> basicdataDriverArteryEntityStream = list.stream().filter(l -> l.getWarehouseId().contains(myCurrentWarehouse.getId().toString()));
Stream<BasicdataDriverArteryEntity> basicdataDriverArteryEntityStream = list.stream().filter(l -> Func.isNotEmpty(l.getWarehouseId()) && l.getWarehouseId().contains(myCurrentWarehouse.getId().toString()));
if (Func.isNotEmpty(basicdataDriverArteryEntityStream)){ if (Func.isNotEmpty(basicdataDriverArteryEntityStream)){
basicdataDriverArteryEntityStream.forEach(l->{ basicdataDriverArteryEntityStream.forEach(l->{
BasicdataDriverArteryVO driverArteryVO = Func.copy(l, BasicdataDriverArteryVO.class); BasicdataDriverArteryVO driverArteryVO = Func.copy(l, BasicdataDriverArteryVO.class);

Write Preview
Loading…
Cancel
Save