收益概览

device-api-service/src/main/java/com/xy/service/MercFeeCountMonthServiceImpl.java

@@ -84,10 +84,17 @@ public class MercFeeCountMonthServiceImpl extends ServiceImpl<MercFeeCountMonthM
         LocalDateTime endTime = page.getEndTime();
         String start = LocalDateTimeUtil.format(beginTime, DatePattern.SIMPLE_MONTH_PATTERN);
         String end = LocalDateTimeUtil.format(endTime, DatePattern.SIMPLE_MONTH_PATTERN);
+
         LambdaQueryWrapper<MercFeeCountMonth> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, MercFeeCountMonth.class)
                 .build()
-                .between(StrUtil.isNotEmpty(start) && StrUtil.isNotEmpty(end), MercFeeCountMonth::getDateValue, Integer.valueOf(start), Integer.valueOf(end))
+
                 .orderByDesc(MercFeeCountMonth::getDateValue);
+
+        if (StrUtil.isNotEmpty(start) && StrUtil.isNotEmpty(end)) {
+            int s = Integer.valueOf(start).intValue();
+            int e = Integer.valueOf(end).intValue();
+            lambdaQueryWrapper.between(MercFeeCountMonth::getDateValue, s, e);
+        }
         IPage<MercFeeCountMonth> iPage = page(toIPage(pageBean), lambdaQueryWrapper);
         PageBean<MercFeeCountMonthDto.Vo> pageData = toPageBean(MercFeeCountMonthDto.Vo.class, iPage);
         List<MercFeeCountMonthDto.Vo> records = pageData.getRecords();