From 292c0ad945164a954a14e5e447b16d10c83e47a6 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 十月 2024 19:08:42 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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..0bc1de5 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
@@ -328,8 +328,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 +340,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