From 3af254f1b36e7722673fcebe110da524b276105c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 十二月 2024 17:56:04 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 23 ++++++++++++++++++-----
1 files changed, 18 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..8f2954a 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
@@ -14,6 +14,7 @@
import com.doumee.dao.business.join.DeviceEventJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.DeviceEventVo;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemDictDataMapper;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.DeviceEventService;
@@ -368,12 +369,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 +398,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