From f9bf6830debbe4f7486add9d99ecbbc0d67c13cd Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 23 四月 2024 10:10:13 +0800
Subject: [PATCH] 最新版本
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 76454bb..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());
@@ -330,6 +333,7 @@
.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
@@ -377,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