Browse Source

fix:bug 技师统计信息导出和页面不一致

wrj 7 tháng trước cách đây
mục cha
commit
1524f13a95

+ 6 - 1
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TJsDayController.java

@@ -66,7 +66,12 @@ public class TJsDayController extends BaseController {
     @ApiOperation("导出")
     @RequestMapping(value = "export", method = RequestMethod.POST)
     public void export(HttpServletResponse response, Page<TJsDay> page, TJsDay tJsDay) {
-        Page<TJsDay> day = this.tJsDayService.page(page, new QueryWrapper<>(tJsDay));
+        LambdaQueryWrapper<TJsDay> tJsDayLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        tJsDayLambdaQueryWrapper.le(StringUtils.isNotBlank(tJsDay.getEndTime()) && StringUtils.isNotBlank(tJsDay.getStartTime()), TJsDay::getCountDate, tJsDay.getEndTime()).
+                ge(StringUtils.isNotBlank(tJsDay.getStartTime()) && StringUtils.isNotBlank(tJsDay.getEndTime()),TJsDay::getCountDate, tJsDay.getStartTime()).
+                eq(StringUtils.isNotBlank(tJsDay.getName()), TJsDay::getName, tJsDay.getName()).
+                orderByDesc(TJsDay::getCountDate);
+        Page<TJsDay> day = this.tJsDayService.page(page, tJsDayLambdaQueryWrapper);
         ExcelUtil<TJsDay> util = new ExcelUtil<TJsDay>(TJsDay.class);
         util.exportExcel(response, day.getRecords(), "技师业绩");
     }