1.司机和配送员统计信息合一 2.修改签收率统计信息接口 3.修改签收数据导出接口

wjli

2023-05-15 f88e38dda262f8fb937ea4030e2bc8232d4126f2

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ISignCountServiceImpl.java

@@ -99,6 +99,37 @@
    }

    @Override
    public List<OrderStatusCount> signCounts2New(OrderStatusCount orderStatusCount) {
        List<OrderStatusCount> records = this.signCountMapper.signCount2New(orderStatusCount);
        List<OrderStatusCount> recordsAll = this.signCountMapper.signCountNewTotal(orderStatusCount);
        for (int i=0;i<records.size();i++) {
            for (OrderStatusCount statusCountx: recordsAll) {
                if(records.get(i).getCarName().equals(statusCountx.getCarName())){
                    records.get(i).setSendMonth(statusCountx.getProportion());
                    break;
                }
            }
            //"oneBatch":"01段","twoBatch":"0","threeBatch":"0","fourBatch":"0","fiveBatch":"0"
            if("0".equals(records.get(i).getOneBatch())){
                records.get(i).setOneBatch(null);
            }
            if("0".equals(records.get(i).getTwoBatch())){
                records.get(i).setTwoBatch(null);
            }
            if("0".equals(records.get(i).getThreeBatch())){
                records.get(i).setThreeBatch(null);
            }
            if("0".equals(records.get(i).getFourBatch())){
                records.get(i).setFourBatch(null);
            }
            if("0".equals(records.get(i).getFiveBatch())){
                records.get(i).setFiveBatch(null);
            }
        }
        return records;
    }

    @Override
    public IPage<OrderStatusCount> signCountsNew(OrderStatusCount orderStatusCount, QueryRequest queryRequest) {
        Page<OrderStatusCount> page = new Page<>();
        if (org.apache.commons.lang3.StringUtils.isNotBlank(queryRequest.getPageSize() + "") && (queryRequest.getPageSize() != 0)) {
@@ -108,7 +139,6 @@
            page.setCurrent(0);
            page.setSize(-1);
        }

        IPage<OrderStatusCount> orderStatusCountIPage = this.signCountMapper.signCountNew(orderStatusCount, page);
        List<OrderStatusCount> recordsAll = this.signCountMapper.signCountNewTotal(orderStatusCount);
        List<OrderStatusCount> records = orderStatusCountIPage.getRecords();
@@ -120,6 +150,22 @@
                    break;
                }
            }
            //"oneBatch":"01段","twoBatch":"0","threeBatch":"0","fourBatch":"0","fiveBatch":"0"
            if("0".equals(records.get(i).getOneBatch())){
                records.get(i).setOneBatch(null);
            }
            if("0".equals(records.get(i).getTwoBatch())){
                records.get(i).setTwoBatch(null);
            }
            if("0".equals(records.get(i).getThreeBatch())){
                records.get(i).setThreeBatch(null);
            }
            if("0".equals(records.get(i).getFourBatch())){
                records.get(i).setFourBatch(null);
            }
            if("0".equals(records.get(i).getFiveBatch())){
                records.get(i).setFiveBatch(null);
            }
        }
       // List<OrderStatusCount> recordsLast = new ArrayList<>();
        orderStatusCountIPage.setRecords(records);