From 70577a6d6cf2bded29e71dcad11a0c2605193d20 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 10:32:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index 6339165..ed14417 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -5,11 +5,14 @@
import cn.hutool.core.util.ReUtil;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.RetentionQuery;
import com.doumee.dao.business.RetentionMapper;
import com.doumee.dao.business.join.RetentionJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.SystemDictDataMapper;
+import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.RetentionService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -21,8 +24,9 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* 鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛塖ervice瀹炵幇
@@ -37,6 +41,9 @@
@Autowired
private RetentionJoinMapper retentionJoinMapper;
+
+ @Autowired
+ private SystemDictDataMapper systemDictDataMapper;
@Override
@@ -185,8 +192,7 @@
}
@Override
- public PageData<Retention> findTrainTimePage(PageWrap<RetentionQuery> pageWrap) {
-
+ public PageData<Retention> findTrainTimePage(PageWrap<Retention> pageWrap) {
//鏄惁鏄暟瀛�
boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
//鏄惁鍖呭惈涓枃
@@ -197,29 +203,33 @@
IPage<Retention> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Retention> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- queryWrapper.leftJoin(Company.class,Company::getId,Retention::getId)
- .leftJoin(Member.class,Member::getId,Retention::getMemberId)
- .leftJoin(DeviceEvent.class,DeviceEvent::getEventId,Retention::getEventCode);
+ queryWrapper.leftJoin(Company.class,Company::getId,Retention::getId);
queryWrapper.selectAll(Retention.class)
- .selectAs(Company::getName,Retention::getCompanyName)
- .selectAs(Member::getType,Retention::getMemberType)
- .selectAs(DeviceEvent::getSrcName,Retention::getSrcName);
- queryWrapper.like(number,Member::getPhone,pageWrap.getModel().getKeyWords())
- .like((b||hasWord),Member::getName,pageWrap.getModel().getKeyWords())
+ .selectAs(Company::getName,Retention::getCompanyName);
+ queryWrapper.like(number,Retention::getPhone,pageWrap.getModel().getKeyWords())
+ .like((b||hasWord),Retention::getName,pageWrap.getModel().getKeyWords())
.eq(Objects.nonNull(pageWrap.getModel().getType()),
- Member::getType,
+ Retention::getType,
pageWrap.getModel().getType())
.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
Company::getName,
pageWrap.getModel().getCompanyName())
.ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
- Retention::getEventDate,
- Utils.Date.getStart(pageWrap.getModel().getStartTime()))
+ Retention::getEventDate,pageWrap.getModel().getStartTime())
.le(Objects.nonNull(pageWrap.getModel().getEndTime()),
- Retention::getEventDate,
- Utils.Date.getDayEnd(pageWrap.getModel().getEndTime()));
+ Retention::getEventDate,pageWrap.getModel().getStartTime());
queryWrapper.orderByDesc(Retention::getCreateDate);
IPage<Retention> retentionIPage = retentionJoinMapper.selectJoinPage(page, Retention.class, queryWrapper);
+ if(null != retentionIPage && retentionIPage.getRecords().size() > 0) {
+ 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()));
+ retentionIPage.getRecords().stream().forEach(obj->{
+ obj.setFaceImg(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
+ +dataMap.get(Constants.MEMBER_IMG).getCode()
+ +obj.getFaceImg());
+ });
+ }
return PageData.from(retentionIPage);
}
}
--
Gitblit v1.9.3