From 0ffd4876dbd797eec552f1b76192d4201f3062c6 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 05 三月 2025 16:07:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index a7b6d61..855db4f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -202,6 +202,14 @@
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.setTypeName(Constants.Status.COMPANY_TYPE_FK.getDes());
+ if(null != obj.getCompanyType()) {
+ if(Constants.ZERO == obj.getCompanyType()){
+ obj.setTypeName(Constants.Status.COMPANY_TYPE_REL.getDes());
+ }else if(Constants.ONE == obj.getCompanyType()) {
+ obj.setTypeName(Constants.Status.COMPANY_TYPE_INTERNAL.getDes());
+ }
+ }
if(StringUtils.isNotBlank(obj.getFaceImg())){
obj.setFaceImgFull(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
+dataMap.get(Constants.MEMBER_IMG).getCode()
@@ -267,7 +275,7 @@
RetentionVo vo = new RetentionVo();
vo.setCompanyName(obj.getCompanyName());
vo.setTypeName(Constants.Status.COMPANY_TYPE_FK.getDes());
- if(null != obj.getType()) {
+ if(null != obj.getCompanyType()) {
if(Constants.ZERO == obj.getCompanyType()){
vo.setTypeName(Constants.Status.COMPANY_TYPE_REL.getDes());
}else if(Constants.ONE == obj.getCompanyType()) {
@@ -285,7 +293,7 @@
return retentionVoList;
}
- private IPage<Retention> getDataInfo(PageWrap<Retention> pageWrap) {
+ private IPage<Retention> getDataInfo(PageWrap<Retention> pageWrap) {
//鏄惁鏄暟瀛�
// boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
// //鏄惁鍖呭惈涓枃
--
Gitblit v1.9.3