|
|
@ -105,6 +105,10 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper |
|
|
|
if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getName())) { |
|
|
|
qw.like("a.warehouseName", query.getName()); |
|
|
|
} |
|
|
|
if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getEndTime())) { |
|
|
|
qw.apply(StringUtils.isNotBlank(query.getEndTime()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getEndTime() + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
} |
|
|
|
List<ProjectDetailsVo> storeInfos = baseMapper.listQuery(qw); |
|
|
|
for (ProjectDetailsVo storeInfo : storeInfos) { |
|
|
|
List<WarehouseInventory> warehouseInventories=warehouseInventoryService.list(new QueryWrapper<WarehouseInventory>().eq("warehouseSid",storeInfo.getSid())); |
|
|
|