liujie
2 天以前 59099ec96f7a2da11df4b0b1593092b0aff38e90
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpIssueReportingServiceImpl.java
@@ -38,6 +38,10 @@
    @Override
    public PageInfo<TErpIssueReportingVO> pageList(TErpIssueReportingQuery query) {
        PageInfo<TErpIssueReportingVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(query.getReportStartTime()!=null && !query.getReportStartTime().isEmpty() && query.getReportEndTime()!=null && !query.getReportEndTime().isEmpty()){
            query.setReportStartTime(query.getReportStartTime()+" 00:00:00");
            query.setReportEndTime(query.getReportEndTime()+" 23:59:59");
        }
        List<TErpIssueReportingVO> list = this.baseMapper.pageList(query,pageInfo);
        if(CollectionUtils.isEmpty(list)){
            return pageInfo;
@@ -52,6 +56,7 @@
                    break;
                case 2:
                    crmClinics.stream().filter(t -> t.getId().equals(tErpIssueReportingVO.getReportUserId())).findFirst().ifPresent(t -> tErpIssueReportingVO.setSupplierClinicName(t.getClinicName()));
                    break;
            }
        }
        pageInfo.setRecords(list);