From 3728fa293e1faf4bf4f9bf41105b84ddb43dc82e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 02 十一月 2026 16:53:02 +0800
Subject: [PATCH] feat(order-rates): 新增筛选条件下全部订单费用汇总接口
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderRatesServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderRatesServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderRatesServiceImpl.java
index 49afc1e..137adb6 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderRatesServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderRatesServiceImpl.java
@@ -9,6 +9,7 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.dto.SampleOrderDto;
+import com.ruoyi.inspect.dto.OrderRatesSummaryDto;
import com.ruoyi.inspect.dto.TemplateRateDto;
import com.ruoyi.inspect.mapper.InsOrderRatesMapper;
import com.ruoyi.inspect.pojo.InsOrderRates;
@@ -38,12 +39,25 @@
*/
@Override
public IPage<SampleOrderDto> selectInsOrderRates(Page page, SampleOrderDto sampleOrderDto, String startMonth, String endMonth) {
+ return baseMapper.selectInsOrderRates(page, ratesFilter(sampleOrderDto, startMonth, endMonth));
+ }
+
+ @Override
+ public OrderRatesSummaryDto selectRatesSummary(SampleOrderDto sampleOrderDto, String startMonth, String endMonth) {
+ return baseMapper.selectRatesSummary(ratesFilter(sampleOrderDto, startMonth, endMonth));
+ }
+
+ private QueryWrapper<SampleOrderDto> ratesFilter(SampleOrderDto sampleOrderDto, String startMonth, String endMonth) {
QueryWrapper<SampleOrderDto> wrapper = QueryWrappers.queryWrappers(sampleOrderDto);
if (wrapper == null) {
wrapper = Wrappers.query();
}
if (StrUtil.isNotBlank(startMonth) || StrUtil.isNotBlank(endMonth)) {
try {
+ if (StrUtil.isNotBlank(startMonth) && StrUtil.isNotBlank(endMonth)
+ && YearMonth.parse(startMonth).isAfter(YearMonth.parse(endMonth))) {
+ throw new ErrorException("寮�濮嬫湀浠戒笉鑳芥櫄浜庣粨鏉熸湀浠�");
+ }
if (StrUtil.isNotBlank(startMonth)) {
wrapper.ge("sample_date", YearMonth.parse(startMonth).atDay(1));
}
@@ -54,7 +68,7 @@
throw new ErrorException("閫佹牱鏃堕棿绛涢�夋牸寮忎笉姝ｇ‘锛屽簲涓� yyyy-MM");
}
}
- return baseMapper.selectInsOrderRates(page, wrapper);
+ return wrapper;
}
@Override
--
Gitblit v1.9.3