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 | 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