From e0965debdfc7149b9490d66d45c8737ca574ed21 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 15 十二月 2023 14:47:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java | 108 ++++++++++++++++--------------------------------------
1 files changed, 32 insertions(+), 76 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
index 691c146..c8ab1a8 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
@@ -2,14 +2,18 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.ParkBookMapper;
-import com.doumee.dao.business.model.ParkBook;
+import com.doumee.dao.business.join.ParkBookJoinMapper;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.ParkBookService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -26,6 +30,11 @@
@Autowired
private ParkBookMapper parkBookMapper;
+
+ @Autowired
+ private ParkBookJoinMapper parkBookJoinMapper;
+
+
@Override
public Integer create(ParkBook parkBook) {
@@ -87,81 +96,28 @@
@Override
public PageData<ParkBook> findPage(PageWrap<ParkBook> pageWrap) {
IPage<ParkBook> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<ParkBook> queryWrapper = new QueryWrapper<>();
- Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(ParkBook::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(ParkBook::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(ParkBook::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(ParkBook::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getEdirot() != null) {
- queryWrapper.lambda().eq(ParkBook::getEdirot, pageWrap.getModel().getEdirot());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(ParkBook::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(ParkBook::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(ParkBook::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(ParkBook::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getHkId() != null) {
- queryWrapper.lambda().eq(ParkBook::getHkId, pageWrap.getModel().getHkId());
- }
- if (pageWrap.getModel().getSortnum() != null) {
- queryWrapper.lambda().eq(ParkBook::getSortnum, pageWrap.getModel().getSortnum());
- }
- if (pageWrap.getModel().getVisitId() != null) {
- queryWrapper.lambda().eq(ParkBook::getVisitId, pageWrap.getModel().getVisitId());
- }
- if (pageWrap.getModel().getCarCode() != null) {
- queryWrapper.lambda().eq(ParkBook::getCarCode, pageWrap.getModel().getCarCode());
- }
- if (pageWrap.getModel().getParkId() != null) {
- queryWrapper.lambda().eq(ParkBook::getParkId, pageWrap.getModel().getParkId());
- }
- if (pageWrap.getModel().getOrigin() != null) {
- queryWrapper.lambda().eq(ParkBook::getOrigin, pageWrap.getModel().getOrigin());
- }
- if (pageWrap.getModel().getStartTime() != null) {
- queryWrapper.lambda().ge(ParkBook::getStartTime, Utils.Date.getStart(pageWrap.getModel().getStartTime()));
- queryWrapper.lambda().le(ParkBook::getStartTime, Utils.Date.getEnd(pageWrap.getModel().getStartTime()));
- }
- if (pageWrap.getModel().getEndTime() != null) {
- queryWrapper.lambda().ge(ParkBook::getEndTime, Utils.Date.getStart(pageWrap.getModel().getEndTime()));
- queryWrapper.lambda().le(ParkBook::getEndTime, Utils.Date.getEnd(pageWrap.getModel().getEndTime()));
- }
- if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(ParkBook::getMemberId, pageWrap.getModel().getMemberId());
- }
- if (pageWrap.getModel().getTimeType() != null) {
- queryWrapper.lambda().eq(ParkBook::getTimeType, pageWrap.getModel().getTimeType());
- }
- if (pageWrap.getModel().getHkId2() != null) {
- queryWrapper.lambda().eq(ParkBook::getHkId2, pageWrap.getModel().getHkId2());
- }
- if (pageWrap.getModel().getHkStatus() != null) {
- queryWrapper.lambda().eq(ParkBook::getHkStatus, pageWrap.getModel().getHkStatus());
- }
- if (pageWrap.getModel().getHkDate() != null) {
- queryWrapper.lambda().ge(ParkBook::getHkDate, Utils.Date.getStart(pageWrap.getModel().getHkDate()));
- queryWrapper.lambda().le(ParkBook::getHkDate, Utils.Date.getEnd(pageWrap.getModel().getHkDate()));
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(parkBookMapper.selectPage(page, queryWrapper));
+ MPJLambdaWrapper<ParkBook> queryWrapper = new MPJLambdaWrapper<>();
+
+ queryWrapper.selectAll(Cars.class);
+ queryWrapper.selectAs(Parks::getName,Cars::getParksName);
+ queryWrapper.selectAs(Member::getType,Cars::getMemberType);
+ queryWrapper.selectAs(Member::getName,Cars::getMemberName);
+ queryWrapper.selectAs(Member::getPhone,Cars::getMemberPhone);
+ queryWrapper.selectAs(Company::getName,Cars::getCompanyName);
+
+ queryWrapper.leftJoin(Parks.class,Parks::getId,ParkBook::getParkId);
+ queryWrapper.leftJoin(Member.class,Member::getId,ParkBook::getMemberId);
+ queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+
+ queryWrapper.eq(ParkBook::getIsdeleted, Constants.ZERO)
+ .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getPhone,pageWrap.getModel().getMemberName())
+ .or().like(Member::getName,pageWrap.getModel().getMemberName()));
+ queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCarCode()),ParkBook::getCarCode,pageWrap.getModel().getCarCode());
+ queryWrapper.orderByDesc(ParkBook::getCreateDate);
+
+ IPage<ParkBook> result = parkBookJoinMapper.selectJoinPage(page, ParkBook.class,queryWrapper);
+
+ return PageData.from(result);
}
@Override
--
Gitblit v1.9.3