From 611e8f7f1986e96980712a083d06b7cfe45f928c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 16 十月 2024 11:03:58 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
index 24e14f4..539a632 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
@@ -368,12 +368,24 @@
.selectAs(Member::getPhone,DeviceEventDTO::getPersonPhone)
.selectAs(Member::getIdcardDecode,DeviceEventDTO::getPersonIdcardDecode)
.selectAs(Device::getName,DeviceEventDTO::getDevName)
- .selectAs(Company::getName,DeviceEventDTO::getPersonCompanyName);
+ .selectAs(Company::getName,DeviceEventDTO::getPersonCompanyName)
+ .selectAs(Company::getType,DeviceEventDTO::getCompanyType);
+
queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),w->
w.like(Member::getName,pageWrap.getModel().getKeyWords()).or().like(Member::getPhone,pageWrap.getModel().getKeyWords()))
- .eq(StringUtils.equals(pageWrap.getModel().getPersonType(),Constants.TWO+""),
- Member::getType,
- pageWrap.getModel().getPersonType())
+
+
+ .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(Member::getIsdeleted,Constants.ZERO)
+
.eq(Objects.nonNull(pageWrap.getModel().getEventType()),
DeviceEvent::getEventType,
pageWrap.getModel().getEventType())
@@ -385,7 +397,7 @@
.le(Objects.nonNull(pageWrap.getModel().getEndTime()),
DeviceEvent::getCreateDate,
pageWrap.getModel().getEndTime())
- .isNull(StringUtils.isNotBlank(pageWrap.getModel().getPersonType()) && !StringUtils.equals(pageWrap.getModel().getPersonType(),Constants.TWO+""),Member::getId)//闄や簡鍐呴儴浜哄憳閮芥槸澶栨潵璁垮
+
.orderByDesc(DeviceEvent::getCreateDate);
queryWrapper.orderByDesc(DeviceEvent::getHappenTime);
IPage<DeviceEventDTO> deviceEventDTOIPage = deviceEventJoinMapper.selectJoinPage(page, DeviceEventDTO.class, queryWrapper);
--
Gitblit v1.9.3