nidapeng
2024-04-23 e521fe9f2852dd008f176e462bf8ad3e5267e68f
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);
        });