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/VisitEventServiceImpl.java | 76 +++++++++++++++-----------------------
1 files changed, 30 insertions(+), 46 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
index fdd39d1..a004435 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
@@ -235,9 +235,9 @@
}
@Override
- public PageData<VisitEventDTO> findVisitPage(PageWrap<VisitEvent> pageWrap) {
+ public PageData<VisitEvent> findVisitPage(PageWrap<VisitEvent> pageWrap) {
- IPage<VisitEventDTO> visitEventDTOIPage = getDataInfo(pageWrap);
+ IPage<VisitEvent> visitEventDTOIPage = getDataInfo(pageWrap);
if(null != visitEventDTOIPage && visitEventDTOIPage.getRecords().size() > 0) {
visitEventDTOIPage.setRecords(newVisitEvent(visitEventDTOIPage.getRecords()));
}
@@ -245,31 +245,12 @@
}
@Override
- public List<VisitEventVo> findPageExcel(PageWrap<VisitEvent> pageWrap) {
- IPage<VisitEventDTO> visitEventExcel = getDataInfo(pageWrap);
- List<VisitEventVo> voList = new ArrayList<>();
- if(null != visitEventExcel && visitEventExcel.getRecords().size() > 0) {
- visitEventExcel.getRecords().stream().forEach(obj->{
- VisitEventVo eventVo = new VisitEventVo();
- eventVo.setPersonName(obj.getPersonName());
- eventVo.setPersonPhone(obj.getPersonPhone());
- eventVo.setPersonIdcardDecode(obj.getPersonIdcardDecode());
- eventVo.setPersonCompanyName(obj.getPersonCompanyName());
- eventVo.setCarNo(obj.getCarNo());
- eventVo.setBeVisitedPersonName(obj.getBeVisitedPersonName()+"-"+obj.getBeVisitedPersonOrg());
- if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_IN.getKey()){
- eventVo.setEventTypeName(HKConstants.EventTypes.VISIT_SIGN_IN.getName());
- }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_OUT.getKey()){
- eventVo.setEventTypeName(HKConstants.EventTypes.VISIT_SIGN_OUT.getName());
- }
- eventVo.setHappenTime(obj.getHappenTime());
- voList.add(eventVo);
- });
- }
- return voList;
+ public List<VisitEvent> findPageExcel(PageWrap<VisitEvent> pageWrap) {
+ IPage<VisitEvent> visitEventExcel = getDataInfo(pageWrap);
+ return newVisitEvent(visitEventExcel.getRecords());
}
- private IPage<VisitEventDTO> getDataInfo(PageWrap<VisitEvent> pageWrap) {
+ private IPage<VisitEvent> getDataInfo(PageWrap<VisitEvent> pageWrap) {
//鏄惁鏄暟瀛�
boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
//鏄惁鍖呭惈涓枃
@@ -279,9 +260,7 @@
IPage<VisitEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<VisitEvent> queryWrapper = new MPJLambdaWrapper<>();
- queryWrapper .leftJoin(Visits.class,Visits::getHkId,VisitEvent::getVisitorId);
- queryWrapper.selectAll(VisitEvent.class)
- .selectAs(Visits::getCompanyName,VisitEventDTO::getPersonCompanyName);
+ queryWrapper.selectAll(VisitEvent.class);
queryWrapper.like(number,
VisitEvent::getPhone,
pageWrap.getModel().getKeyWords())
@@ -290,41 +269,46 @@
pageWrap.getModel().getKeyWords())
.like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()),
VisitEvent::getCarNo,
- pageWrap.getModel().getKeyWords())
+ pageWrap.getModel().getCarNo())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getVisitorWorkUint()),
+ VisitEvent::getVisitorWorkUint,
+ pageWrap.getModel().getVisitorWorkUint())
.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
Company::getName,
pageWrap.getModel().getCompanyName())
.eq(Objects.nonNull(pageWrap.getModel().getEventType()),
VisitEvent::getEventType,
pageWrap.getModel().getEventType())
- .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
- VisitEvent::getHappenTime,
+ .ge(StringUtils.isNotBlank(pageWrap.getModel().getStartTime()),
+ VisitEvent::getCreateDate,
pageWrap.getModel().getStartTime())
- .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
- VisitEvent::getHappenTime,
- pageWrap.getModel().getEndTime());
+ .le(StringUtils.isNotBlank(pageWrap.getModel().getEndTime()),
+ VisitEvent::getCreateDate,
+ pageWrap.getModel().getEndTime())
+ .eq(VisitEvent::getIsdeleted,Constants.ZERO);
queryWrapper.orderByDesc(VisitEvent::getHappenTime);
- IPage<VisitEventDTO> visitEventDTOIPage = visitEventJoinMapper.selectJoinPage(page, VisitEventDTO.class, queryWrapper);
+ IPage<VisitEvent> visitEventDTOIPage = visitEventJoinMapper.selectJoinPage(page, VisitEvent.class, queryWrapper);
return visitEventDTOIPage;
}
- private List<VisitEventDTO> newVisitEvent(List<VisitEventDTO> VisitEventDTOList) {
+ private List<VisitEvent> newVisitEvent(List<VisitEvent> VisitEventDTOList) {
List<String> codes = Arrays.asList(Constants.FTP_RESOURCE_PATH,Constants.MEMBER_IMG);
List<SystemDictData> list = systemDictDataMapper.list(codes);
Map<String,SystemDictData> dataMap = list.stream().collect(Collectors.toMap(SystemDictData::getLabel, Function.identity()));
- List<VisitEventDTO> newDataList = new ArrayList<>();
VisitEventDTOList.stream().forEach(obj->{
- obj.setCaptureUrl(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
- +dataMap.get(Constants.MEMBER_IMG).getCode()
- +obj.getCaptureUrl());
- if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_IN.getKey()){
- obj.setEventTypeName(HKConstants.EventTypes.VISIT_SIGN_IN.getName());
- }else if(Constants.formatIntegerNum(obj.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_OUT.getKey()){
- obj.setEventTypeName(HKConstants.EventTypes.VISIT_SIGN_OUT.getName());
+
+ if(StringUtils.isNotBlank( obj.getCaptureUrl())
+ && !obj.getCaptureUrl().startsWith(HKConstants.IMG_INDEX)
+ && !obj.getCaptureUrl().startsWith(HKConstants.IMG_INDEX_ERROR)) {
+ if(null != list && list.size() > 0) {
+ obj.setCaptureUrlFull(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
+ +dataMap.get(Constants.VISIT_EVENT_IMG).getCode()
+ +obj.getCaptureUrl());
+ }
}
- newDataList.add(obj);
+ obj.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType())); ;
});
- return newDataList;
+ return VisitEventDTOList;
}
}
--
Gitblit v1.9.3