1、取水口用水日统计表中增加金额、次数字段； 2、优化或重写“累计流量超过指定值的取水口”、“累计流量低于指定值的取水口”、“指定时间段内用水量超过指...

liurunyu

2025-01-07 a15a8cfd7b01ce4bba6fe9fd876f6704ca23a12d

 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java

@@ -1,5 +1,6 @@
package com.dy.pipIrrStatistics.intake;

import com.dy.common.util.DateTime;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoRm.*;
import com.dy.pipIrrGlobal.voSt.*;
@@ -94,7 +95,7 @@
        return rsVo ;
    }

    /**
    /** ok 1
     * 获取累计流量超过指定值的取水口
     * @param qo
     * @return
@@ -116,7 +117,7 @@
        return rsVo ;
    }

    /**
    /** ok 2
     * 获取累计流量低于指定值的取水口
     * @param qo
     * @return
@@ -476,7 +477,7 @@
        return rsVo ;
    }

    /**
    /** ok 3
     * 指定时间段内用水量超过指定值的取水口
     * @param qo
     * @return
@@ -484,37 +485,31 @@
    public QueryResultVo<List<VoIntakeAccumulateAmount>> getUseWaterGtValueIntakes(IntakeAmountValueQO qo) {
        String timeStart = qo.getTimeStart();
        String timeStop = qo.getTimeStop();
        if(timeStart != null && timeStart != "") {
            timeStart = timeStart + " 00:00:00";
        } else {
            timeStart = LocalDate.now() + " 00:00:00";
        if(timeStart == null || timeStart.trim().equals("")) {
            timeStart = DateTime.yyyy_MM_dd() ;
            qo.setTimeStart(timeStart);
        }
        qo.setTimeStart(timeStart);

        if(timeStop != null && timeStop != "") {
            timeStop = timeStop + " 23:59:59";
        }else {
            timeStop = LocalDate.now() + " 23:59:59";
        if(timeStop == null || timeStop.trim().equals("")) {
            timeStop = DateTime.yyyy_MM_dd() ;
            qo.setTimeStop(timeStop);
        }
        qo.setTimeStop(timeStop);

        if (qo.getValue() == null){
            qo.setValue(0.0);
        }

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmOpenCloseValveHistoryMapper.getUseWaterGtValueIntakesCount(params);
        Long itemTotal = rmIntakeAmountDayMapper.getUseWaterGtValueIntakesCount(params);

        QueryResultVo<List<VoIntakeAccumulateAmount>> rsVo = new QueryResultVo<>() ;
        rsVo.pageSize = qo.pageSize ;
        rsVo.pageCurr = qo.pageCurr ;

        rsVo.calculateAndSet(itemTotal, params);
        rsVo.obj = rmOpenCloseValveHistoryMapper.getUseWaterGtValueIntakes(params);
        rsVo.obj = rmIntakeAmountDayMapper.getUseWaterGtValueIntakes(params);
        return rsVo ;
    }

    /**
    /** ok 4
     * 指定时间段内消费金额超过指定值的取水口
     * @param qo
     * @return
@@ -522,36 +517,64 @@
    public QueryResultVo<List<VoIntakeAccumulateAmount>> getExpenseGtValueIntakes(IntakeAmountValueQO qo) {
        String timeStart = qo.getTimeStart();
        String timeStop = qo.getTimeStop();
        if(timeStart != null && timeStart != "") {
            timeStart = timeStart + " 00:00:00";
        } else {
            timeStart = LocalDate.now() + " 00:00:00";
        if(timeStart == null || timeStart.trim().equals("")) {
            timeStart = DateTime.yyyy_MM_dd() ;
            qo.setTimeStart(timeStart);
        }
        qo.setTimeStart(timeStart);

        if(timeStop != null && timeStop != "") {
            timeStop = timeStop + " 23:59:59";
        }else {
            timeStop = LocalDate.now() + " 23:59:59";
        if(timeStop == null || timeStop.trim().equals("")) {
            timeStop = DateTime.yyyy_MM_dd() ;
            qo.setTimeStop(timeStop);
        }
        qo.setTimeStop(timeStop);

        if (qo.getValue() == null){
            qo.setValue(0.0);
        }

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmOpenCloseValveHistoryMapper.getExpenseGtValueIntakesCount(params);
        Long itemTotal = rmIntakeAmountDayMapper.getExpenseGtValueIntakesCount(params);

        QueryResultVo<List<VoIntakeAccumulateAmount>> rsVo = new QueryResultVo<>() ;
        rsVo.pageSize = qo.pageSize ;
        rsVo.pageCurr = qo.pageCurr ;

        rsVo.calculateAndSet(itemTotal, params);
        rsVo.obj = rmOpenCloseValveHistoryMapper.getExpenseGtValueIntakes(params);
        rsVo.obj = rmIntakeAmountDayMapper.getExpenseGtValueIntakes(params);
        return rsVo ;
    }

    /** ok 4
     * 指定时间段内消费金额超过指定值的取水口
     * @param qo
     * @return
     */
    public QueryResultVo<List<VoIntakeAccumulateAmount>> getUseWaterTimesGtValueIntakes(IntakeCountValueQO qo) {
        String timeStart = qo.getTimeStart();
        String timeStop = qo.getTimeStop();
        if(timeStart == null || timeStart.trim().equals("")) {
            timeStart = DateTime.yyyy_MM_dd() ;
            qo.setTimeStart(timeStart);
        }
        if(timeStop == null || timeStop.trim().equals("")) {
            timeStop = DateTime.yyyy_MM_dd() ;
            qo.setTimeStop(timeStop);
        }
        if (qo.getValue() == null){
            qo.setValue(0);
        }

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmIntakeAmountDayMapper.getUseWaterTimesGtValueIntakesCount(params);

        QueryResultVo<List<VoIntakeAccumulateAmount>> rsVo = new QueryResultVo<>() ;
        rsVo.pageSize = qo.pageSize ;
        rsVo.pageCurr = qo.pageCurr ;

        rsVo.calculateAndSet(itemTotal, params);
        rsVo.obj = rmIntakeAmountDayMapper.getUseWaterTimesGtValueIntakes(params);
        return rsVo ;
    }



    /**
     * 指定时间段内用水时长超过指定值的取水口
     * @param qo