|
|
@@ -4,6 +4,7 @@ import cn.hutool.core.util.NumberUtil;
|
|
|
import cn.hutool.poi.excel.ExcelUtil;
|
|
|
import cn.hutool.poi.excel.ExcelWriter;
|
|
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
|
|
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
import com.github.yulichang.base.MPJBaseServiceImpl;
|
|
|
import com.kym.common.utils.CommUtil;
|
|
|
@@ -39,19 +40,13 @@ public class InvoiceDetailServiceImpl extends MPJBaseServiceImpl<InvoiceDetailMa
|
|
|
@Override
|
|
|
public PageBean<InvoiceDetail> listInvoiceDetail(InvoiceDetailQueryParam params) {
|
|
|
PageHelper.startPage(params.getPageNum(), params.getPageSize());
|
|
|
- var res = lambdaQuery()
|
|
|
- .eq(CommUtil.isNotEmptyAndNull(params.getApplyId()), InvoiceDetail::getApplyId, params.getApplyId())
|
|
|
- .orderByDesc(InvoiceDetail::getFapiaoTime)
|
|
|
- .list();
|
|
|
+ var res = buildQuery(params).orderByDesc(InvoiceDetail::getFapiaoTime).list();
|
|
|
return new PageBean<>(res);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public ExcelWriter exportInvoiceDetail(InvoiceDetailQueryParam params) {
|
|
|
- var invoiceDetailList = lambdaQuery()
|
|
|
- .eq(CommUtil.isNotEmptyAndNull(params.getApplyId()), InvoiceDetail::getApplyId, params.getApplyId())
|
|
|
- .orderByDesc(InvoiceDetail::getFapiaoTime)
|
|
|
- .list();
|
|
|
+ var invoiceDetailList = buildQuery(params).orderByDesc(InvoiceDetail::getFapiaoTime).list();
|
|
|
ExcelWriter writer = ExcelUtil.getWriter();
|
|
|
|
|
|
// excel 行信息
|
|
|
@@ -135,4 +130,14 @@ public class InvoiceDetailServiceImpl extends MPJBaseServiceImpl<InvoiceDetailMa
|
|
|
removeByMap(Map.of("apply_id", invoiceDetail.getApplyId()));
|
|
|
save(invoiceDetail);
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 构建带公共过滤条件的查询
|
|
|
+ */
|
|
|
+ private LambdaQueryChainWrapper<InvoiceDetail> buildQuery(InvoiceDetailQueryParam params) {
|
|
|
+ return lambdaQuery()
|
|
|
+ .eq(CommUtil.isNotEmptyAndNull(params.getApplyId()), InvoiceDetail::getApplyId, params.getApplyId())
|
|
|
+ .ge(params.getStartTime() != null, InvoiceDetail::getFapiaoTime, params.getStartTime())
|
|
|
+ .le(params.getEndTime() != null, InvoiceDetail::getFapiaoTime, params.getEndTime());
|
|
|
+ }
|
|
|
}
|