From 37d2aec0dbe914c8924d6514da7eca053eee4cf3 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期三, 26 三月 2025 17:26:35 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/loss/LossCtrl.java | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/loss/LossCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/loss/LossCtrl.java index f3e7f67..2e84f53 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/loss/LossCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/loss/LossCtrl.java @@ -6,9 +6,7 @@ import com.dy.common.webUtil.BaseResponseUtils; import com.dy.common.webUtil.QueryResultVo; import com.dy.pipIrrGlobal.voSt.VoDayLoss; -import com.dy.pipIrrStatistics.intake.IntakeSv; -import com.dy.pipIrrStatistics.intake.qo.IntakeAmountQO; -import com.dy.pipIrrStatistics.result.StatisticlResultCode; +import com.dy.pipIrrGlobal.voSt.VoMonthAmount; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -16,8 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; /** @@ -60,4 +56,18 @@ return BaseResponseUtils.buildSuccess(this.sv.lossAmountOfDay(qo)); } + /** + * 鏌ヨ鎸囧畾鏈堜唤鍚勬棩婕忔崯閲� + * @param qo + * @return + */ + @GetMapping(path = "/lossAmountOfMonth") + @SsoAop() + public BaseResponse<QueryResultVo<List<VoMonthAmount>>> lossAmountOfMonth(LossQo qo) throws Exception { + if(qo.getYear() == null) { + return BaseResponseUtils.buildErrorMsg("鏌ヨ鏉′欢骞村害涓嶈兘涓虹┖"); + } + return BaseResponseUtils.buildSuccess(this.sv.lossAmountOfMonth(qo)); + } + } -- Gitblit v1.8.0