From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 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 0bc1de5..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
@@ -1,8 +1,8 @@
 package com.doumee.service.business.impl;
 
 import com.doumee.core.haikang.model.HKConstants;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
 import com.doumee.core.utils.Constants;
 import com.doumee.core.utils.Utils;
 import com.doumee.dao.admin.response.CarEventDTO;
@@ -10,6 +10,7 @@
 import com.doumee.dao.business.join.CarEventJoinMapper;
 import com.doumee.dao.business.model.*;
 import com.doumee.dao.business.vo.CarEventVo;
+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.CarEventService;
@@ -285,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());
@@ -318,7 +319,6 @@
         IPage<CarEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
         MPJLambdaWrapper<CarEvent> queryWrapper = new MPJLambdaWrapper<>();
         Utils.MP.blankToNull(pageWrap.getModel());
-
         queryWrapper
                 .leftJoin(Member.class,Member::getId,CarEvent::getMemberId)
                 .leftJoin(Company.class,Company::getId,Member::getCompanyId);
@@ -335,7 +335,7 @@
                 CarEvent::getPlateNos,
                 pageWrap.getModel().getPlateNos())
 
-                .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),i->i.like(Member::getPhone,pageWrap.getModel().getKeyWords()).or().like(Member::getPhone,
+                .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),i->i.like(Member::getName,pageWrap.getModel().getKeyWords()).or().like(Member::getPhone,
                         pageWrap.getModel().getKeyWords()))
                 .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
                         Company::getName,

--
Gitblit v1.9.3