From b35a46c502f4bcc22c75e9e3c7fd29af5b98d84b Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 05 三月 2025 16:06:54 +0800
Subject: [PATCH] 代码初始化

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 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 cfdece5..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
@@ -55,8 +55,9 @@
 
     @Override
     public void deleteById(Integer id) {
-        retentionMapper.update(null,new UpdateWrapper<Retention>().lambda().set(Retention::getIsdeleted,Constants.ONE).eq(Retention::getId,id));
-//        retentionMapper.deleteById(id);
+//        retentionMapper.update(null,new UpdateWrapper<Retention>().lambda().set(Retention::getIsdeleted,Constants.ONE)
+//                .eq(Retention::getId,id));
+        retentionMapper.deleteById(id);
     }
 
     @Override
@@ -231,8 +232,8 @@
                 .selectAs(Member::getPhone,Retention::getPhone)
                 .selectAs(Member::getVisitCompanyName,Retention::getVisitCompanyName)
                 .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),w->{
-                    w.like( Retention::getPhone,pageWrap.getModel().getKeyWords())
-                            .or().like( Retention::getName,pageWrap.getModel().getKeyWords()); })
+                    w.like( Member::getPhone,pageWrap.getModel().getKeyWords())
+                            .or().like( Member::getName,pageWrap.getModel().getKeyWords()); })
                 .eq(Retention::getType,3)
                 .eq(Retention::getIsdeleted,Constants.ZERO)
                 .and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
@@ -265,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