From 3201bba04baf50d368fbc4ac11658701e97a0a97 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 05 三月 2025 09:59:05 +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/CarEventServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 ddb1602..f039bff 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
@@ -286,16 +286,16 @@
carEventExcel.getRecords().stream().forEach(obj->{
CarEventVo vo = new CarEventVo();
vo.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType())) ;
- if(null != obj.getPersonType()) {
- if(Constants.ZERO == obj.getPersonType()){
- vo.setTypeName(Constants.Status.LW_FK.getDes());
- }else if(Constants.ONE == obj.getPersonType()) {
- vo.setTypeName(Constants.Status.PT_FK.getDes());
- }else {
- vo.setTypeName(Constants.Status.NB_FK.getDes());
+ if(obj.getCompanyType() == null){
+ obj.setCompanyType(Constants.THREE);
+ }
+ vo.setTypeName(Constants.Status.COMPANY_TYPE_FK.getDes());
+ if(null != obj.getCompanyType()) {
+ if(Constants.ZERO == obj.getCompanyType()){
+ vo.setTypeName(Constants.Status.COMPANY_TYPE_REL.getDes());
+ }else if(Constants.ONE == obj.getCompanyType()) {
+ vo.setTypeName(Constants.Status.COMPANY_TYPE_INTERNAL.getDes());
}
- }else {
- vo.setTypeName("");
}
vo.setPlateNos(obj.getPlateNos());
vo.setPersonName(obj.getPersonName());
--
Gitblit v1.9.3