From d3d1b082c49f13abda7e1b73964f7f7fa62105b0 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期日, 08 十月 2023 14:43:28 +0800 Subject: [PATCH] 账单接口 --- server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java index 7239413..6e0e3a2 100644 --- a/server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java +++ b/server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java @@ -2,8 +2,10 @@ import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; +import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.Utils; import com.doumee.dao.business.WxBillDetailMapper; +import com.doumee.dao.business.model.WxBill; import com.doumee.dao.business.model.WxBillDetail; import com.doumee.service.business.WxBillDetailService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -185,6 +187,8 @@ if (pageWrap.getModel().getRateRemark() != null) { queryWrapper.lambda().eq(WxBillDetail::getRateRemark, pageWrap.getModel().getRateRemark()); } + queryWrapper.lambda().ge(pageWrap.getModel().getStartDate() !=null, WxBillDetail::getPid,DateUtil.getShortDateStr(pageWrap.getModel().getStartDate())); + queryWrapper.lambda().le(pageWrap.getModel().getEndDate() !=null,WxBillDetail::getPid, DateUtil.getShortDateStr(pageWrap.getModel().getEndDate())); for(PageWrap.SortData sortData: pageWrap.getSorts()) { if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) { queryWrapper.orderByDesc(sortData.getProperty()); -- Gitblit v1.9.3