|
@@ -50,7 +50,8 @@ public class TJsDayController extends BaseController {
|
|
|
public R selectAll(Page<TJsDay> page, TJsDay 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());
|
|
|
+ ge(StringUtils.isNotBlank(tJsDay.getStartTime()) && StringUtils.isNotBlank(tJsDay.getEndTime()),TJsDay::getCountDate, tJsDay.getStartTime()).
|
|
|
+ eq(StringUtils.isNotBlank(tJsDay.getName()), TJsDay::getName, tJsDay.getName());
|
|
|
return R.ok(this.tJsDayService.page(page, tJsDayLambdaQueryWrapper));
|
|
|
}
|
|
|
|