diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java index be2172f69f..7e501cab39 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java @@ -216,22 +216,22 @@ public class BusValcustFilingService extends MybatisBaseService p = new PagerVo<>(); return p; } - if (StringUtils.isNotBlank(query.getContractNo())) { - qw.like("bf.contractNo", query.getContractNo()); - } - if (StringUtils.isNotBlank(query.getCreateByName())) { - qw.like("bf.createByName", query.getCreateByName()); - } - if (StringUtils.isNotBlank(query.getModelName())) { - qw.like("bf.modelName", query.getModelName()); - } - String createStartTime = query.getCreateStartTime(); - String createEndTime = query.getCreateEndTime(); - qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (bf.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(createEndTime), "date_format (bf.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" - ); - qw.orderByDesc("bf.createTime"); } + if (StringUtils.isNotBlank(query.getContractNo())) { + qw.like("bf.contractNo", query.getContractNo()); + } + if (StringUtils.isNotBlank(query.getCreateByName())) { + qw.like("bf.createByName", query.getCreateByName()); + } + if (StringUtils.isNotBlank(query.getModelName())) { + qw.like("bf.modelName", query.getModelName()); + } + String createStartTime = query.getCreateStartTime(); + String createEndTime = query.getCreateEndTime(); + qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (bf.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(createEndTime), "date_format (bf.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + qw.orderByDesc("bf.createTime"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null);