From 61c2c3482a7495805a4590fef8d2a1b1cd1127f8 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 26 二月 2024 17:38:38 +0800
Subject: [PATCH] ERP接口
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java | 95 +++++++++++++++++++++++++++++++----------------
1 files changed, 63 insertions(+), 32 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 16a128b..11ae971 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
@@ -16,6 +16,7 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.SystemDictDataMapper;
import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.dao.system.vo.VisitEventVo;
import com.doumee.service.business.VisitEventService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -236,6 +237,35 @@
@Override
public PageData<VisitEventDTO> findVisitPage(PageWrap<VisitEvent> pageWrap) {
+ IPage<VisitEventDTO> visitEventDTOIPage = getDataInfo(pageWrap);
+ if(null != visitEventDTOIPage && visitEventDTOIPage.getRecords().size() > 0) {
+ visitEventDTOIPage.setRecords(newVisitEvent(visitEventDTOIPage.getRecords()));
+ }
+ return PageData.from(visitEventDTOIPage);
+ }
+
+ @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.setIdNo(obj.getIdNo());
+ eventVo.setPersonCompanyName(obj.getPersonCompanyName());
+ eventVo.setCarNo(obj.getCarNo());
+ eventVo.setBeVisitedPersonName(obj.getBeVisitedPersonName()+"-"+obj.getBeVisitedPersonOrg());
+ eventVo.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType()));
+ eventVo.setHappenTime(obj.getHappenTime());
+ voList.add(eventVo);
+ });
+ }
+ return voList;
+ }
+
+ private IPage<VisitEventDTO> getDataInfo(PageWrap<VisitEvent> pageWrap) {
//鏄惁鏄暟瀛�
boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
//鏄惁鍖呭惈涓枃
@@ -247,35 +277,33 @@
MPJLambdaWrapper<VisitEvent> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper .leftJoin(Visits.class,Visits::getHkId,VisitEvent::getVisitorId);
queryWrapper.selectAll(VisitEvent.class)
- .selectAs(Visits::getCompanyName,VisitEventDTO::getPersonCompanyName);
+ .selectAs(Visits::getCompanyName,VisitEventDTO::getPersonCompanyName);
queryWrapper.like(number,
- VisitEvent::getPhone,
- pageWrap.getModel().getKeyWords())
- .like((b ||hasWord),
- VisitEvent::getPersonName,
- pageWrap.getModel().getKeyWords())
- .like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()),
- VisitEvent::getCarNo,
- pageWrap.getModel().getKeyWords())
- .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,
- pageWrap.getModel().getStartTime())
- .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
- VisitEvent::getHappenTime,
- pageWrap.getModel().getEndTime());
+ VisitEvent::getPhone,
+ pageWrap.getModel().getKeyWords())
+ .like((b ||hasWord),
+ VisitEvent::getPersonName,
+ pageWrap.getModel().getKeyWords())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()),
+ VisitEvent::getCarNo,
+ pageWrap.getModel().getKeyWords())
+ .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,
+ pageWrap.getModel().getStartTime())
+ .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
+ VisitEvent::getHappenTime,
+ pageWrap.getModel().getEndTime());
queryWrapper.orderByDesc(VisitEvent::getHappenTime);
IPage<VisitEventDTO> visitEventDTOIPage = visitEventJoinMapper.selectJoinPage(page, VisitEventDTO.class, queryWrapper);
- if(null != visitEventDTOIPage && visitEventDTOIPage.getRecords().size() > 0) {
- visitEventDTOIPage.setRecords(newVisitEvent(visitEventDTOIPage.getRecords()));
- }
- return PageData.from(visitEventDTOIPage);
+ return visitEventDTOIPage;
}
+
private List<VisitEventDTO> newVisitEvent(List<VisitEventDTO> VisitEventDTOList) {
List<String> codes = Arrays.asList(Constants.FTP_RESOURCE_PATH,Constants.MEMBER_IMG);
@@ -283,14 +311,17 @@
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.setCaptureUrl(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
+ +dataMap.get(Constants.MEMBER_IMG).getCode()
+ +obj.getCaptureUrl());
+ }
}
+ obj.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType())) ;
newDataList.add(obj);
});
return newDataList;
--
Gitblit v1.9.3