From 1266685e9bd5d5c2c2360abea3a93a668edc3dec Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 28 四月 2025 16:20:13 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 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 4c625f1..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()
@@ -266,16 +274,13 @@
for (Retention obj:retentionInfo.getRecords()) {
RetentionVo vo = new RetentionVo();
vo.setCompanyName(obj.getCompanyName());
- if(null != obj.getType()) {
- if(Constants.ZERO == obj.getType()){
- vo.setTypeName(Constants.Status.LW_FK.getDes());
- }else if(Constants.ONE == obj.getType()) {
- vo.setTypeName(Constants.Status.PT_FK.getDes());
- }else {
- vo.setTypeName(Constants.Status.NB_FK.getDes());
+ vo.setTypeName(Constants.Status.COMPANY_TYPE_FK.getDes());
+ if(null != obj.getCompanyType()) {
+ if(Constants.ZERO == obj.getCompanyType()){
+ vo.setTypeName(Constants.Status.COMPANY_TYPE_REL.getDes());
+ }else if(Constants.ONE == obj.getCompanyType()) {
+ vo.setTypeName(Constants.Status.COMPANY_TYPE_INTERNAL.getDes());
}
- }else {
- vo.setTypeName("");
}
vo.setName(obj.getName());
vo.setPhone(obj.getPhone());
@@ -288,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