From 62bf2ee66bb60c98a4c52df5b04ae735e75da583 Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期五, 20 六月 2025 14:22:37 +0800 Subject: [PATCH] feat(card): 添加水卡记录查询功能 --- pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java index e33506e..066894a 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java @@ -84,16 +84,22 @@ List<Integer> yearGrp = new ArrayList<Integer>(); int nowYear = Integer.parseInt(DateTime.yyyy()) ; if(qo.year == null) { - for(int i = startYear4YearStatistics; i <= nowYear; i++) { + int startYear = nowYear - 4 ;//鏌�5骞寸殑 + if(startYear < startYear4YearStatistics){ + startYear = startYear4YearStatistics ; + } + for(int i = startYear; i <= nowYear; i++) { yearGrp.add(i) ; } }else{ + /* if(qo.year > nowYear){ qo.year = nowYear; } if(qo.year < startYear4YearStatistics){ qo.year = startYear4YearStatistics; } + */ yearGrp.add(qo.year) ; } return BaseResponseUtils.buildSuccess(this.sv.selectStClientAmountYear(qo, yearGrp)); -- Gitblit v1.8.0