From 70577a6d6cf2bded29e71dcad11a0c2605193d20 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 10:32:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java |   94 +++++++++++++---------------------------------
 1 files changed, 27 insertions(+), 67 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
index 64358a0..4a8efab 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
@@ -10,17 +10,20 @@
 import com.doumee.core.utils.Utils;
 import com.doumee.dao.admin.request.CarsQuery;
 import com.doumee.dao.admin.response.CarsDTO;
+import com.doumee.dao.admin.response.MemberInfoDTO;
 import com.doumee.dao.business.CarsMapper;
 import com.doumee.dao.business.join.CarJoinMapper;
 import com.doumee.dao.business.join.ParkBookJoinMapper;
 import com.doumee.dao.business.model.*;
 import com.doumee.service.business.CarsService;
 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;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 杞﹁締淇℃伅琛⊿ervice瀹炵幇
@@ -101,73 +104,30 @@
 
 
         IPage<Cars> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
-        QueryWrapper<Cars> queryWrapper = new QueryWrapper<>();
-        Utils.MP.blankToNull(pageWrap.getModel());
-        if (pageWrap.getModel().getId() != null) {
-            queryWrapper.lambda().eq(Cars::getId, pageWrap.getModel().getId());
-        }
-        if (pageWrap.getModel().getCreator() != null) {
-            queryWrapper.lambda().eq(Cars::getCreator, pageWrap.getModel().getCreator());
-        }
-        if (pageWrap.getModel().getCreateDate() != null) {
-            queryWrapper.lambda().ge(Cars::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
-            queryWrapper.lambda().le(Cars::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
-        }
-        if (pageWrap.getModel().getEdirot() != null) {
-            queryWrapper.lambda().eq(Cars::getEdirot, pageWrap.getModel().getEdirot());
-        }
-        if (pageWrap.getModel().getEditDate() != null) {
-            queryWrapper.lambda().ge(Cars::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
-            queryWrapper.lambda().le(Cars::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
-        }
-        if (pageWrap.getModel().getIsdeleted() != null) {
-            queryWrapper.lambda().eq(Cars::getIsdeleted, pageWrap.getModel().getIsdeleted());
-        }
-        if (pageWrap.getModel().getRemark() != null) {
-            queryWrapper.lambda().eq(Cars::getRemark, pageWrap.getModel().getRemark());
-        }
-        if (pageWrap.getModel().getHkId() != null) {
-            queryWrapper.lambda().eq(Cars::getHkId, pageWrap.getModel().getHkId());
-        }
-        if (pageWrap.getModel().getSortnum() != null) {
-            queryWrapper.lambda().eq(Cars::getSortnum, pageWrap.getModel().getSortnum());
-        }
-        if (pageWrap.getModel().getCode() != null) {
-            queryWrapper.lambda().eq(Cars::getCode, pageWrap.getModel().getCode());
-        }
-        if (pageWrap.getModel().getParkId() != null) {
-            queryWrapper.lambda().eq(Cars::getParkId, pageWrap.getModel().getParkId());
-        }
-        if (pageWrap.getModel().getHkId2() != null) {
-            queryWrapper.lambda().eq(Cars::getHkId2, pageWrap.getModel().getHkId2());
-        }
-        if (pageWrap.getModel().getHkStatus() != null) {
-            queryWrapper.lambda().eq(Cars::getHkStatus, pageWrap.getModel().getHkStatus());
-        }
-        if (pageWrap.getModel().getHkDate() != null) {
-            queryWrapper.lambda().ge(Cars::getHkDate, Utils.Date.getStart(pageWrap.getModel().getHkDate()));
-            queryWrapper.lambda().le(Cars::getHkDate, Utils.Date.getEnd(pageWrap.getModel().getHkDate()));
-        }
-        if (pageWrap.getModel().getMemberId() != null) {
-            queryWrapper.lambda().eq(Cars::getMemberId, pageWrap.getModel().getMemberId());
-        }
-        if (pageWrap.getModel().getMemberUserId() != null) {
-            queryWrapper.lambda().eq(Cars::getMemberUserId, pageWrap.getModel().getMemberUserId());
-        }
-        if (pageWrap.getModel().getErpId() != null) {
-            queryWrapper.lambda().eq(Cars::getErpId, pageWrap.getModel().getErpId());
-        }
-        if (pageWrap.getModel().getStatus() != null) {
-            queryWrapper.lambda().eq(Cars::getStatus, pageWrap.getModel().getStatus());
-        }
-        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
-            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
-                queryWrapper.orderByDesc(sortData.getProperty());
-            } else {
-                queryWrapper.orderByAsc(sortData.getProperty());
-            }
-        }
-        return PageData.from(carsMapper.selectPage(page, queryWrapper));
+        MPJLambdaWrapper<Cars> 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,Cars::getParkId);
+        queryWrapper.leftJoin(Member.class,Member::getId,Cars::getMemberId);
+        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+
+
+        queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
+                .or().like(Member::getPhone,pageWrap.getModel().getMemberName()));
+        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName());
+        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getMemberType()),Member::getType,pageWrap.getModel().getMemberType());
+        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCode()),Cars::getCode,pageWrap.getModel().getCode());
+        queryWrapper.eq(Cars::getIsdeleted,Constants.ZERO);
+
+        queryWrapper.orderByDesc(Cars::getCreateDate);
+        IPage<Cars> result = carJoinMapper.selectJoinPage(page, Cars.class,queryWrapper);
+        return PageData.from(result);
     }
 
     @Override

--
Gitblit v1.9.3