修改bug

liurunyu

2025-08-21 9ba987e9232b71cefbb800114dd09985d7fef888

 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientCtrl.java

@@ -6,6 +6,7 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.voSt.*;
import com.dy.pipIrrStatistics.card.IcCardqo.CommonQO;
import com.dy.pipIrrStatistics.card.qo.CardUsageQO;
import com.dy.pipIrrStatistics.client.qo.*;
import com.dy.pipIrrStatistics.intake.qo.ClientAmountQO;
import com.dy.pipIrrStatistics.result.StatisticlResultCode;
@@ -48,6 +49,9 @@
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        try {
            if(qo.getOpenCount() == null){
                qo.setOpenCount(0);
            }
            return BaseResponseUtils.buildSuccess(clientSv.getLargeOpenCountClients(qo));
        } catch (Exception e) {
            log.error("获取开卡记录异常", e);
@@ -68,6 +72,9 @@
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        try {
            if(qo.getOpenCount() == null){
                qo.setOpenCount(0);
            }
            return BaseResponseUtils.buildSuccess(clientSv.getSmallOpenCountClients(qo));
        } catch (Exception e) {
            log.error("获取开卡记录异常", e);
@@ -88,6 +95,9 @@
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        try {
            if(qo.getWaterConsumption() == null){
                qo.setWaterConsumption(0.0D);
            }
            return BaseResponseUtils.buildSuccess(clientSv.getLargeWaterConsumptionClients(qo));
        } catch (Exception e) {
            log.error("获取开卡记录异常", e);
@@ -108,6 +118,9 @@
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        try {
            if(qo.getWaterConsumption() == null){
                qo.setWaterConsumption(0.0D);
            }
            return BaseResponseUtils.buildSuccess(clientSv.getSmallWaterConsumptionClients(qo));
        } catch (Exception e) {
            log.error("获取记录异常", e);
@@ -128,6 +141,9 @@
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        try {
            if(qo.getAmountSpent() == null){
                qo.setAmountSpent(0.0D);
            }
            return BaseResponseUtils.buildSuccess(clientSv.getLargeAmountSpentClients(qo));
        } catch (Exception e) {
            log.error("获取开卡记录异常", e);
@@ -148,6 +164,9 @@
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        try {
            if(qo.getAmountSpent() == null){
                qo.setAmountSpent(0.0D);
            }
            return BaseResponseUtils.buildSuccess(clientSv.getSmallAmountSpentClients(qo));
        } catch (Exception e) {
            log.error("获取记录异常", e);
@@ -168,6 +187,9 @@
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        try {
            if(qo.getWaterDuration() == null){
                qo.setWaterDuration(0);
            }
            return BaseResponseUtils.buildSuccess(clientSv.getLargeWaterDurationClients(qo));
        } catch (Exception e) {
            log.error("获取开卡记录异常", e);
@@ -188,6 +210,9 @@
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        try {
            if(qo.getWaterDuration() == null){
                qo.setWaterDuration(0);
            }
            return BaseResponseUtils.buildSuccess(clientSv.getSmallWaterDurationClients(qo));
        } catch (Exception e) {
            log.error("获取开卡记录异常", e);
@@ -298,4 +323,43 @@
        }
    }


    /**
     * 最近未充值的农户
     *
     * @param qo
     * @return
     */
    @GetMapping(path = "/getNotRechargeLastClients")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoClient>>> getNotRechargeLastClients(CommonQO qo) {
        try {
            QueryResultVo<List<VoClient>> res = clientSv.getNotRechargeLastClients(qo);
            return BaseResponseUtils.buildSuccess(res);
        }catch (Exception e){
            log.error("获取记录异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
        }
    }

    /**
     * 获取指定时间段农户：充值合计、消费合计、余额
     * @param qo
    //* @param bindingResult
     * @return
     */
    @GetMapping(path = "/client_usage")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoCardUsage>>> getClientUsages(@Valid CardUsageQO qo, BindingResult bindingResult) {
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }

        try {
            return BaseResponseUtils.buildSuccess(clientSv.getClientUsages(qo));
        } catch (Exception e) {
            log.error("获取开卡记录异常", e);
            return BaseResponseUtils.buildException(e.getMessage()) ;
        }
    }
}