From 65b4101c151b763c5f61751b94e4eb5dd4c1c4b3 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 07 十二月 2023 11:44:28 +0800
Subject: [PATCH] #时间统计，列表查询 题目模块
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java | 68 +++++++++++++++++++++++++++++++++
1 files changed, 67 insertions(+), 1 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 b9fba31..3463258 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
@@ -1,20 +1,32 @@
package com.doumee.service.business.impl;
+import cn.hutool.core.lang.PatternPool;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.ReUtil;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.admin.request.VisitEventQuery;
+import com.doumee.dao.admin.response.VisitEventDTO;
import com.doumee.dao.business.VisitEventMapper;
+import com.doumee.dao.business.join.VisitEventJoinMapper;
+import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.model.DeviceEvent;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.VisitEvent;
import com.doumee.service.business.VisitEventService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
/**
* 璁垮浜嬩欢鎺ㄩ�佽褰曡〃Service瀹炵幇
@@ -26,6 +38,9 @@
@Autowired
private VisitEventMapper visitEventMapper;
+
+ @Autowired
+ private VisitEventJoinMapper visitEventJoinMapper;
@Override
public Integer create(VisitEvent visitEvent) {
@@ -83,7 +98,7 @@
QueryWrapper<VisitEvent> wrapper = new QueryWrapper<>(visitEvent);
return visitEventMapper.selectList(wrapper);
}
-
+
@Override
public PageData<VisitEvent> findPage(PageWrap<VisitEvent> pageWrap) {
IPage<VisitEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -211,4 +226,55 @@
QueryWrapper<VisitEvent> wrapper = new QueryWrapper<>(visitEvent);
return visitEventMapper.selectCount(wrapper);
}
+
+ @Override
+ public PageData<VisitEventDTO> findVisitPage(PageWrap<VisitEventQuery> 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<VisitEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<VisitEvent> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.leftJoin(Member.class,Member::getId,VisitEvent::getVisitorId)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.selectAll(VisitEvent.class)
+ .selectAs(Member::getPhone,VisitEventDTO::getPersonPhone)
+ .selectAs(Member::getType,VisitEventDTO::getPersonType)
+ .selectAs(Member::getIdcardDecode,VisitEventDTO::getPersonIdcardDecode)
+ .selectAs(Company::getName,VisitEventDTO::getPersonCompanyName);
+
+ queryWrapper.like(number,
+ Member::getPhone,
+ pageWrap.getModel().getKeyWords())
+ .like((b ||hasWord),
+ Member::getPhone,
+ pageWrap.getModel().getKeyWords())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()),
+ Member::getPhone,
+ pageWrap.getModel().getKeyWords())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
+ Company::getName,
+ pageWrap.getModel().getCompanyName())
+ .eq(StringUtils.isNotBlank(pageWrap.getModel().getSrcType()),
+ VisitEvent::getSrcType,
+ pageWrap.getModel().getSrcType())
+ .eq(StringUtils.isNotBlank(pageWrap.getModel().getEventType()),
+ VisitEvent::getEventType,
+ pageWrap.getModel().getEventType())
+ .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
+ VisitEvent::getHappenTime,
+ Utils.Date.getStart(pageWrap.getModel().getStartTime()))
+ .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
+ VisitEvent::getHappenTime,
+ Utils.Date.getDayEnd(pageWrap.getModel().getEndTime()));
+ queryWrapper.orderByDesc(VisitEvent::getHappenTime);
+ IPage<VisitEventDTO> visitEventDTOIPage = visitEventJoinMapper.selectJoinPage(page, VisitEventDTO.class, queryWrapper);
+ return PageData.from(visitEventDTOIPage);
+ }
+
+
}
--
Gitblit v1.9.3