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 | 77 ++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 40 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 12f16d6..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
@@ -283,22 +283,14 @@
return PageData.from(carEventDTOIPage);
}
-
+ @Override
public List<CarEventVo> findPageExcel(PageWrap<CarEvent> pageWrap) {
- IPage<CarEventDTO> carEventExcel= getDataInfo(pageWrap);
+ IPage<CarEventDTO> carEventExcel = getDataInfo(pageWrap);
List<CarEventVo> newDataList = new ArrayList<>();
if(null != carEventExcel && carEventExcel.getRecords().size() > 0) {
carEventExcel.getRecords().stream().forEach(obj->{
CarEventVo vo = new CarEventVo();
- if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.PARK_LINE_IN.getKey()){
- vo.setEventTypeName(HKConstants.EventTypes.PARK_LINE_IN.getName());
- }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey()){
- vo.setEventTypeName(HKConstants.EventTypes.PARK_PASS_IN.getName());
- }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.PARK_LINE_OUT.getKey()){
- vo.setEventTypeName(HKConstants.EventTypes.PARK_LINE_OUT.getName());
- }else{
- vo.setEventTypeName(HKConstants.EventTypes.PARK_PASS_OUT.getName());
- }
+ vo.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType())) ;
if(null != obj.getPersonType()) {
if(Constants.ZERO == obj.getPersonType()){
vo.setTypeName(Constants.Status.LW_FK.getDes());
@@ -313,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());
@@ -325,39 +320,33 @@
}
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<>();
Utils.MP.blankToNull(pageWrap.getModel());
- queryWrapper.leftJoin(Cars.class,Cars::getCode,CarEvent::getPlateNos)
- .leftJoin(Member.class,Member::getId,Cars::getMemberId)
+ queryWrapper
+ .leftJoin(Member.class,Member::getId,CarEvent::getMemberId)
.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.selectAll(CarEvent.class)
.selectAs(Member::getType,CarEventDTO::getPersonType)
.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())
- .eq(StringUtils.isNotBlank(pageWrap.getModel().getMemberType()),
+ .eq( pageWrap.getModel().getMemberType()!=null,
Member::getType,
pageWrap.getModel().getMemberType())
.eq(Objects.nonNull(pageWrap.getModel().getEventType()),
@@ -366,7 +355,8 @@
.ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
CarEvent::getCreateDate, pageWrap.getModel().getStartTime())
.le(Objects.nonNull(pageWrap.getModel().getEndTime()),
- CarEvent::getCreateDate, pageWrap.getModel().getEndTime());
+ CarEvent::getCreateDate, pageWrap.getModel().getEndTime())
+ .orderByDesc(CarEvent::getCreateDate);
IPage<CarEventDTO> carEventDTOIPage = carEventJoinMapper.selectJoinPage(page, CarEventDTO.class, queryWrapper);
return carEventDTOIPage;
}
@@ -377,18 +367,25 @@
Map<String,SystemDictData> dataMap = list.stream().collect(Collectors.toMap(SystemDictData::getLabel, Function.identity()));
List<CarEventDTO> newDataList = new ArrayList<>();
newCarEventDTOList.stream().forEach(obj->{
- obj.setVehiclePicUrl(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
- +dataMap.get(Constants.CAR_EVENT_IMG).getCode()
- +obj.getVehiclePicUrl());
- if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.PARK_LINE_IN.getKey()){
- obj.setEventTypeName(HKConstants.EventTypes.PARK_LINE_IN.getName());
- }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey()){
- obj.setEventTypeName(HKConstants.EventTypes.PARK_PASS_IN.getName());
- }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.PARK_LINE_OUT.getKey()){
- obj.setEventTypeName(HKConstants.EventTypes.PARK_LINE_OUT.getName());
- }else{
- obj.setEventTypeName(HKConstants.EventTypes.PARK_PASS_OUT.getName());
+ if(obj.getVehiclePicUrl()!=null
+ && !obj.getVehiclePicUrl().startsWith(HKConstants.IMG_INDEX)
+ && !obj.getVehiclePicUrl().startsWith(HKConstants.IMG_INDEX_ERROR)){
+ obj.setVehiclePicUrl(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
+ +dataMap.get(Constants.CAR_EVENT_IMG).getCode()
+ +obj.getVehiclePicUrl());
}
+ if(obj.getPlatePicUrl()!=null
+ && !obj.getVehiclePicUrl().startsWith(HKConstants.IMG_INDEX)
+ && !obj.getVehiclePicUrl().startsWith(HKConstants.IMG_INDEX_ERROR)){
+ obj.setPlatePicUrl(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
+ +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);
});
return newDataList;
--
Gitblit v1.9.3