From 1a03c63abab3409bfe3831bf67025cb3140fc9ef Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 29 三月 2024 18:08:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index ffd6741..2b57685 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -103,6 +103,29 @@
}
@Override
+ public Member findDetailById(Integer id) {
+ MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(Member.class)
+ .selectAs(DispatchUnit::getName,Member::getDuName)
+ .selectAs(Worktype::getName,Member::getWorkTypeName)
+ .selectAs(Solutions::getName,Member::getSolutionName)
+ .selectAs(Company::getName,Member::getCompanyName)
+ .select(" case when now() between t.start_time and t.end_time then 1 else 2 end solutionsStatus ")
+ .leftJoin(InsuranceApply.class,InsuranceApply::getId,Member::getApplyId)
+ .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+ .leftJoin(DispatchUnit.class,DispatchUnit::getId,Member::getDuId)
+ .leftJoin(Worktype.class,Worktype::getId,Member::getWorktypeId)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .eq(Member::getId,id)
+ .eq(Member::getIsdeleted, Constants.ZERO)
+ .last(" limit 1 ")
+ ;
+ return memberJoinMapper.selectJoinOne(Member.class,queryWrapper);
+ }
+
+
+
+ @Override
public Member findOne(Member member) {
QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
return memberMapper.selectOne(wrapper);
@@ -207,6 +230,10 @@
.leftJoin(DispatchUnit.class,DispatchUnit::getId,Member::getDuId)
.leftJoin(Worktype.class,Worktype::getId,Member::getWorktypeId)
.leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .and(StringUtils.isNotBlank(memberQueryDTO.getKeywords()),
+ i->i.like(Member::getName, memberQueryDTO.getKeywords()).or().like(
+ Member::getIdcardNo,memberQueryDTO.getKeywords()
+ ))
.eq(Member::getIsdeleted, Constants.ZERO)
// .eq(Member::getCompanyId, memberQueryDTO.getCompanyId())
.like(StringUtils.isNotBlank(memberQueryDTO.getName()),Member::getName, memberQueryDTO.getName())
--
Gitblit v1.9.3