From 3201bba04baf50d368fbc4ac11658701e97a0a97 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 05 三月 2025 09:59:05 +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/RetentionServiceImpl.java |   13 +++++--------
 1 files changed, 5 insertions(+), 8 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..a7b6d61 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
@@ -266,16 +266,13 @@
             for (Retention obj:retentionInfo.getRecords()) {
                 RetentionVo vo = new RetentionVo();
                 vo.setCompanyName(obj.getCompanyName());
+                vo.setTypeName(Constants.Status.COMPANY_TYPE_FK.getDes());
                 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());
+                    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());

--
Gitblit v1.9.3