From 39500edd05aced7a2d9debba5a243b756dd2a939 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 22 十月 2024 09:13:37 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index cad0a48..63e8713 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -131,6 +131,8 @@
private NoticesJoinMapper noticesJoinMapper;
@Autowired
private InoutDayCountMapper inoutDayCountMapper;
+ @Autowired
+ private CarEventMapper carEventMapper;
@Autowired
private SmsConfigMapper smsConfigMapper;
@@ -1228,6 +1230,18 @@
queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ //鏁版嵁鏉冮檺寮�濮�--------------------start----------------
+ LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
+ if(userInfo!=null && userInfo.getCompanyIdList()!=null){
+ if( userInfo.getCompanyIdList().size() ==0){
+ //鍙兘鐪嬭嚜宸�(鎷滆浜猴級
+ queryWrapper.eq(Member::getId,userInfo.getMemberId());
+ }else{
+ queryWrapper.in(Company::getId ,userInfo.getCompanyIdList());
+ }
+ }
+ //鏁版嵁鏉冮檺寮�濮�--------------------end----------------
+
queryWrapper.eq(Visits::getIsdeleted,Constants.ZERO);
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType())&&Constants.equalsInteger(pageWrap.getModel().getType(),Constants.TWO),Visits::getType,pageWrap.getModel().getType());
queryWrapper.ne(Objects.nonNull(pageWrap.getModel().getType())&&!Constants.equalsInteger(pageWrap.getModel().getType(),Constants.TWO),Visits::getType,Constants.TWO);
@@ -1584,23 +1598,48 @@
List<InterestedListVO> weekVisitList = new ArrayList<>();
List<InterestedListVO> weekCarList = new ArrayList<>();
List<InterestedListVO> lwList = new ArrayList<>();
+ //鏌ヨ涓冨ぉ鍓嶇殑璁垮璁板綍鏁伴噺
+ List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda().in(Visits::getStatus,
+ Constants.VisitStatus.signin,Constants.VisitStatus.signout)
+ .apply(" STARTTIME > CURDATE() - INTERVAL 7 DAY " )
+ );
+
+ List<CarEvent> carEventList = carEventMapper.selectList(new QueryWrapper<CarEvent>().lambda()
+ .in(CarEvent::getEventType,"771760131","771760130")
+ .apply(" STR_TO_DATE(happen_time, '%Y-%m-%dT%H:%i:%s') > CURDATE() - INTERVAL 7 DAY " )
+ );
for (String days:weekDays) {
- InoutDayCount inoutDayCount = inoutDayCountMapper.selectOne(new QueryWrapper<InoutDayCount>()
- .lambda()
- .apply(" DATE(TIME_INFO) = '"+days+"' ")
- .last(" limit 1 ")
- );
InterestedListVO visitVO = new InterestedListVO();
+ visitVO.setName(days);
+ if(CollectionUtils.isNotEmpty(visitsList)){
+ //澶勭悊璁垮浜哄憳鏁伴噺
+ List<Visits> daysList = visitsList.stream().filter(i->Objects.nonNull(i.getStarttime())&&DateUtil.dateToString(i.getStarttime(),"yyyy-MM-dd").equals(days)).collect(Collectors.toList());
+ List<String> memberIds = daysList.stream().map(i->i.getMemberId().toString()).collect(Collectors.toList());
+ if(CollectionUtils.isNotEmpty(memberIds)){
+ visitVO.setNum(new HashSet<String>(memberIds).size());
+ }
+ }
+ if(Objects.isNull(visitVO.getNum())){
+ visitVO.setNum(Constants.ZERO);
+ }
+
+
visitVO.setName(days);
InterestedListVO carVO = new InterestedListVO();
carVO.setName(days);
- if(Objects.isNull(inoutDayCount)){
+
+
+ if(CollectionUtils.isNotEmpty(carEventList)){
+ //澶勭悊璁垮浜哄憳鏁伴噺
+ List<CarEvent> daysList = carEventList.stream().filter(i->StringUtils.isNotBlank(i.getHappenTime()) && i.getHappenTime().substring(0,10).equals(days)).collect(Collectors.toList());
+ List<String> carCodeList = daysList.stream().map(i->i.getPlateNos()).collect(Collectors.toList());
+ if(CollectionUtils.isNotEmpty(carCodeList)){
+ carVO.setNum(new HashSet<String>(carCodeList).size());
+ }
+ }
+ if(Objects.isNull(carVO.getNum())){
visitVO.setNum(Constants.ZERO);
- carVO.setNum(Constants.ZERO);
- }else{
- visitVO.setNum(inoutDayCount.getInVisitorNum());
- carVO.setNum(inoutDayCount.getInCarNum());
}
weekVisitList.add(visitVO);
weekCarList.add(carVO);
@@ -1655,7 +1694,6 @@
queryWrapper.selectAll(Visits.class);
queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
queryWrapper.select("TIMESTAMPDIFF( MINUTE, NOW(), t.OUT_DATE) AS timeOut");
- queryWrapper.selectAs(Member::getType,Visits::getMemberType);
queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
--
Gitblit v1.9.3