From c52a775aeb3386dfab1ac78ac3430ff86934220a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 17 十二月 2024 13:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
index aaace00..bbb7b8f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
@@ -318,7 +318,6 @@
IPage<CarEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<CarEvent> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
-
queryWrapper
.leftJoin(Member.class,Member::getId,CarEvent::getMemberId)
.leftJoin(Company.class,Company::getId,Member::getCompanyId);
@@ -328,8 +327,8 @@
.selectAs(Member::getIdcardDecode,CarEventDTO::getPersonIdcardDecode)
.selectAs(Member::getName,CarEventDTO::getPersonName)
.selectAs(Member::getVisitCompanyName,CarEventDTO::getVisitCompanyName)
- .selectAs(Company::getName,CarEventDTO::getPersonCompanyName);
-
+ .selectAs(Company::getName,CarEventDTO::getPersonCompanyName)
+ .selectAs(Company::getType,CarEventDTO::getCompanyType);
queryWrapper
.like(StringUtils.isNotBlank(pageWrap.getModel().getPlateNos()),
CarEvent::getPlateNos,
@@ -340,9 +339,18 @@
.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
Company::getName,
pageWrap.getModel().getCompanyName())
- .eq( pageWrap.getModel().getMemberType()!=null,
- Member::getType,
- pageWrap.getModel().getMemberType())
+
+
+ .eq( pageWrap.getModel().getQueryUserType()!=null&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.ONE),
+ Company::getType, Constants.ZERO)
+
+ .isNull( pageWrap.getModel().getQueryUserType()!=null&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.ZERO),
+ Member::getCompanyId)
+
+ .eq( pageWrap.getModel().getQueryUserType()!=null&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.TWO),
+ Company::getType, Constants.ONE)
+
+
.eq(Objects.nonNull(pageWrap.getModel().getEventType()),
CarEvent::getEventType,
pageWrap.getModel().getEventType())
--
Gitblit v1.9.3