lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
dfdg
2025-09-06 18:33:06 +08:00
parent 5cbb0c630b
commit 95c2858a64
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMaterialbatchdemandplanServiceImpl.java
View File

@ -93,6 +93,7 @@ public class BusMaterialbatchdemandplanServiceImpl extends ServiceImpl<BusMateri
bo1.setType("2"); bo1.setType("2");
bo1.setWinningBidderId(bo.getSupplierId()); bo1.setWinningBidderId(bo.getSupplierId());
List<BusBillofquantitiesLimitListVo> busBiddingPlanVos = busBiddingPlanService.getBillofquantitiesLimitListVo(bo1); List<BusBillofquantitiesLimitListVo> busBiddingPlanVos = busBiddingPlanService.getBillofquantitiesLimitListVo(bo1);
if (busBiddingPlanVos != null && !busBiddingPlanVos.isEmpty()) {
Set<String> hashSet = new HashSet<>(); Set<String> hashSet = new HashSet<>();
busBiddingPlanVos.stream().forEach(vo -> { busBiddingPlanVos.stream().forEach(vo -> {
hashSet.add(vo.getName()+"+"+vo.getSpecification()); hashSet.add(vo.getName()+"+"+vo.getSpecification());
@ -105,6 +106,8 @@ public class BusMaterialbatchdemandplanServiceImpl extends ServiceImpl<BusMateri
result.setRecords(list); result.setRecords(list);
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }
return null;
}
/** /**
* 查询符合条件的物资-批次需求计划列表 * 查询符合条件的物资-批次需求计划列表

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBiddingPlanServiceImpl.java
View File

@ -362,9 +362,11 @@ public class BusBiddingPlanServiceImpl extends ServiceImpl<BusBiddingPlanMapper,
@Override @Override
public List<BusBillofquantitiesLimitListVo> getBillofquantitiesLimitListVo(BusBiddingPlanBo bo1) { public List<BusBillofquantitiesLimitListVo> getBillofquantitiesLimitListVo(BusBiddingPlanBo bo1) {
List<Long> ids = baseMapper.getBillofquantitiesId(bo1.getType(),bo1.getWinningBidderId(),bo1.getProjectId()); List<Long> ids = baseMapper.getBillofquantitiesId(bo1.getType(),bo1.getWinningBidderId(),bo1.getProjectId());
if (ids!=null && !ids.isEmpty()){
return busBillofquantitiesLimitListService.queryVoByIds(ids); return busBillofquantitiesLimitListService.queryVoByIds(ids);
} }
return null;
}
/** /**
* 递归构建树形结构 * 递归构建树形结构