blame | history | patch | commit | commitdiff | ignore whitespace
935090232@qq.com
2021-04-13 94c48f85ee7956719cbc60d95fffa61f6bdcc81d 
 zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java


@@ -125,13 +125,15 @@




        queryUse.setTaocanId(null);


        queryUse.setType(Dictionary.SHOPPING_GOODS_TYPE_TC);


        List<SysProjUse> taoCanList = projUseService.findInPage(queryUse, null);


//        List<SysProjUse> taoCanList = projUseService.findInPage(queryUse, null);


        List<SysProjUse> taoCanList = projUseService.findTaocaoProjUseWithProj(queryUse);


        List<ServiceTcVo> serviceTcVos = SysProjUseMapper.INSTANCE.entityListToTcVoList(taoCanList);




        if (CollectionUtils.isNotEmpty(serviceTcVos)) {


            serviceTcVos.forEach(item -> {


                List<SysProjUse> sysProjUses = projUseService.selectTaocanProjUse(item.getId(), queryUse.getStatus());


                List<ServiceProjVo> taocanProj = SysProjUseMapper.INSTANCE.entityListToProjVoList(sysProjUses);


//                List<SysProjUse> sysProjUses = projUseService.selectTaocanProjUse(item.getId(), queryUse.getStatus());


                List<ServiceProjVo> taocanProj = SysProjUseMapper.INSTANCE.entityListToProjVoList(item.getTaocanProjUse());


                item.setTaocanProjUse(null);


                item.setProj(taocanProj);


            });


        }