海政通
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
liujie
2 天以前 7df0337148d9d6d6158ad93564aa2a3c827265cc 
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmClinicServiceImpl.java


@@ -24,8 +24,10 @@


import org.springframework.util.CollectionUtils;




import java.math.BigDecimal;


import java.text.SimpleDateFormat;


import java.time.LocalDate;


import java.util.Arrays;


import java.util.Date;


import java.util.List;


import java.util.Objects;


import java.util.stream.Collectors;


@@ -56,10 +58,11 @@


        }




        List<String> clinicIds = list.stream().map(TCrmClinicVO::getId).collect(Collectors.toList());


        String monthDate = new SimpleDateFormat("yyyy-MM").format(new Date());


        List<TErpProcurement> procurements = erpProcurementService.list(Wrappers.lambdaQuery(TErpProcurement.class)


                .in(TErpProcurement::getClinicId, clinicIds)


                .in(TErpProcurement::getStatus, Arrays.asList(3,4,5))


                .likeRight(TErpProcurement::getCreateTime, LocalDate.now()));


                .likeRight(TErpProcurement::getCreateTime, monthDate));


        for (TCrmClinicVO tCrmClinicVO : list) {


            List<TErpProcurement> procurementList = procurements.stream().filter(procurement -> procurement.getClinicId().equals(tCrmClinicVO.getId())).collect(Collectors.toList());


            if(!CollectionUtils.isEmpty(procurementList)){


@@ -144,10 +147,11 @@


        }




        List<String> clinicIds = list.stream().map(TCrmClinicListExport::getId).collect(Collectors.toList());


        String monthDate = new SimpleDateFormat("yyyy-MM").format(new Date());


        List<TErpProcurement> procurements = erpProcurementService.list(Wrappers.lambdaQuery(TErpProcurement.class)


                .in(TErpProcurement::getClinicId, clinicIds)


                .in(TErpProcurement::getStatus, Arrays.asList(3,4,5))


                .likeRight(TErpProcurement::getCreateTime, LocalDate.now()));


                .likeRight(TErpProcurement::getCreateTime, monthDate));


        for (TCrmClinicListExport crmClinicListExport : list) {


            List<TErpProcurement> procurementList = procurements.stream().filter(procurement -> procurement.getClinicId().equals(crmClinicListExport.getId())).collect(Collectors.toList());


            if(!CollectionUtils.isEmpty(procurementList)){