From 81b2bbdbb92dd70ca28c9d556cd8dc4e9329584f Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 11 三月 2024 09:15:55 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index 0f2e09a..05a95ea 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -55,7 +55,8 @@
@Override
public void deleteById(Integer id) {
- retentionMapper.deleteById(id);
+ retentionMapper.update(null,new UpdateWrapper<Retention>().lambda().set(Retention::getIsdeleted,Constants.ONE).eq(Retention::getId,id));
+// retentionMapper.deleteById(id);
}
@Override
@@ -205,6 +206,13 @@
+dataMap.get(Constants.MEMBER_IMG).getCode()
+obj.getFaceImg());
}
+ if(Objects.nonNull(obj.getType())){
+ if(!obj.getType().equals(Constants.memberType.visitor)){
+ obj.setExcelCompanyName(obj.getCompanyName());
+ }else{
+ obj.setExcelCompanyName(obj.getVisitCompanyName());
+ }
+ }
});
}
return PageData.from(retentionIPage);
@@ -256,11 +264,14 @@
queryWrapper.selectAll(Retention.class)
.selectAs(Company::getName,Retention::getCompanyName)
.select(" ( SELECT v.company_name FROM visits v WHERE v.member_id = t.member_id and v.status = "+Constants.VisitStatus.signin+" ORDER BY create_date DESC limit 1 ) as visitCompanyName ");
- queryWrapper.like(number,Retention::getPhone,pageWrap.getModel().getKeyWords())
+ queryWrapper.eq(Retention::getIsdeleted,Constants.ZERO)
+ .like(number,Retention::getPhone,pageWrap.getModel().getKeyWords())
.like((b||hasWord),Retention::getName,pageWrap.getModel().getKeyWords())
.eq(Objects.nonNull(pageWrap.getModel().getType()),
Retention::getType,
pageWrap.getModel().getType())
+ //杩囨护杞﹁締鏁版嵁
+ .ne(Retention::getType,3)
.and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
p-> p.like(Company::getName, pageWrap.getModel().getCompanyName())
.or()
@@ -268,7 +279,7 @@
.ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
Retention::getEventDate,pageWrap.getModel().getStartTime())
.le(Objects.nonNull(pageWrap.getModel().getEndTime()),
- Retention::getEventDate,pageWrap.getModel().getStartTime());
+ Retention::getEventDate,pageWrap.getModel().getEndTime());
queryWrapper.orderByDesc(Retention::getCreateDate);
IPage<Retention> retentionIPage = retentionJoinMapper.selectJoinPage(page, Retention.class, queryWrapper);
return retentionIPage;
--
Gitblit v1.9.3