From 6765787baa5e0b771d71f865c4deb776367410c4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 13 八月 2024 13:38:19 +0800
Subject: [PATCH] 修复bug
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
index 33f91cc..629b747 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
@@ -305,7 +305,10 @@
vo.setPlateNos(obj.getPlateNos());
vo.setPersonName(obj.getPersonName());
vo.setPersonPhone(obj.getPersonPhone());
- vo.setPersonCompanyName(obj.getPersonCompanyName());
+ if(!Constants.equalsInteger(obj.getPersonType(),Constants.TWO)){
+ //濡傛灉涓嶆槸鍐呴儴浜哄憳锛屾樉绀鸿瀹紒涓氬悕绉�
+ vo.setPersonCompanyName(obj.getVisitCompanyName());
+ }
vo.setParkName(obj.getParkName());
vo.setGateName(obj.getGateName());
vo.setInoutType(obj.getInoutType());
@@ -317,12 +320,6 @@
}
private IPage<CarEventDTO> getDataInfo(PageWrap<CarEvent> pageWrap) {
- //鏄惁鏄暟瀛�
- boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
- //鏄惁鍖呭惈涓枃
- boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
- //鏄惁鍖呭惈鑻辨枃
- boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());
IPage<CarEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<CarEvent> queryWrapper = new MPJLambdaWrapper<>();
@@ -336,16 +333,16 @@
.selectAs(Member::getPhone,CarEventDTO::getPersonPhone)
.selectAs(Member::getIdcardDecode,CarEventDTO::getPersonIdcardDecode)
.selectAs(Member::getName,CarEventDTO::getPersonName)
+ .selectAs(Member::getVisitCompanyName,CarEventDTO::getVisitCompanyName)
.selectAs(Company::getName,CarEventDTO::getPersonCompanyName);
- queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getPlateNos()),
+
+ queryWrapper
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getPlateNos()),
CarEvent::getPlateNos,
pageWrap.getModel().getPlateNos())
- .like(number,
- Member::getPhone,
- pageWrap.getModel().getKeyWords())
- .like((b || hasWord),
- Member::getPhone,
- pageWrap.getModel().getKeyWords())
+
+ .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),i->i.like(Member::getPhone,pageWrap.getModel().getKeyWords()).or().like(Member::getPhone,
+ pageWrap.getModel().getKeyWords()))
.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
Company::getName,
pageWrap.getModel().getCompanyName())
@@ -384,6 +381,10 @@
+dataMap.get(Constants.CAR_EVENT_IMG).getCode()
+obj.getPlatePicUrl());
}
+ if(!Constants.equalsInteger(obj.getPersonType(),Constants.TWO)){
+ //濡傛灉涓嶆槸鍐呴儴浜哄憳锛屾樉绀鸿瀹紒涓氬悕绉�
+ obj.setPersonCompanyName(obj.getVisitCompanyName());
+ }
obj.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType()) );
newDataList.add(obj);
});
--
Gitblit v1.9.3