diff --git a/src/main/java/com/mini/capi/api/biz/appController.java b/src/main/java/com/mini/capi/api/biz/appController.java index 68c17e2..d97aee2 100644 --- a/src/main/java/com/mini/capi/api/biz/appController.java +++ b/src/main/java/com/mini/capi/api/biz/appController.java @@ -2,7 +2,9 @@ package com.mini.capi.api.biz; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mini.capi.biz.domain.ErpSummaryAllView; +import com.mini.capi.biz.domain.ErpSummarySourceView; import com.mini.capi.biz.service.ErpSummaryAllViewService; +import com.mini.capi.biz.service.ErpSummarySourceViewService; import com.mini.capi.model.ApiResult; import com.mini.capi.utils.DateUtils; import jakarta.annotation.Resource; @@ -12,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.ArrayList; import java.util.List; @RestController @@ -24,11 +25,15 @@ public class appController { private ErpSummaryAllViewService summaryAllViewService; + @Resource + private ErpSummarySourceViewService summarySourceViewService; + + /** * 实时汇总 */ - @GetMapping("getSummaryChart") - public ApiResult getSummaryChart(String cycleType) { + @GetMapping("getSummaryAllChart") + public ApiResult getSummaryAllChart(String cycleType) { QueryWrapper queryWrapper = new QueryWrapper<>(); if (StringUtils.hasText(cycleType)) { queryWrapper.eq("f_cycle", cycleType); @@ -40,4 +45,24 @@ public class appController { List summaryViews = summaryAllViewService.list(queryWrapper); return ApiResult.success(summaryViews); } + + /** + * 分类汇总 + */ + @GetMapping("getSummarySourceChart") + public ApiResult getSummarySourceChart(String cycleType, String source) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + if (StringUtils.hasText(source)) { + queryWrapper.eq("f_source", source); + } + if (StringUtils.hasText(cycleType)) { + queryWrapper.eq("f_cycle", cycleType); + String cDate = DateUtils.calculateStartCycleCode(cycleType); + if (cDate != null) { + queryWrapper.ge("c_date", cDate); + } + } + List summaryViews = summarySourceViewService.list(queryWrapper); + return ApiResult.success(summaryViews); + } }