From 15e588eb6a7549ecd2aaffb45e67f11e68354eb6 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 05 二月 2024 18:22:19 +0800
Subject: [PATCH] 111
---
server/service/src/main/java/com/doumee/service/business/impl/MemberInsuranceServiceImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberInsuranceServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberInsuranceServiceImpl.java
index 5743ae7..dc8b93d 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberInsuranceServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberInsuranceServiceImpl.java
@@ -5,6 +5,8 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.MemberInsuranceMapper;
+import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberInsurance;
import com.doumee.service.business.MemberInsuranceService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -16,6 +18,7 @@
import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
/**
* 鍛樺伐鎶曚繚鏄庣粏璁板綍Service瀹炵幇
@@ -27,6 +30,9 @@
@Autowired
private MemberInsuranceMapper memberInsuranceMapper;
+
+ @Autowired
+ private MemberMapper memberMapper;
@Override
public Integer create(MemberInsurance memberInsurance) {
@@ -83,6 +89,7 @@
public List<MemberInsurance> findList(MemberInsurance memberInsurance) {
memberInsurance.setIsdeleted(Constants.ZERO);
QueryWrapper<MemberInsurance> wrapper = new QueryWrapper<>(memberInsurance);
+ wrapper.orderByDesc("CREATE_DATE");
return memberInsuranceMapper.selectList(wrapper);
}
@@ -121,6 +128,12 @@
queryWrapper.lambda().eq(MemberInsurance::getApplyId, pageWrap.getModel().getApplyId());
}
if (pageWrap.getModel().getMemberId() != null) {
+
+ Member member = memberMapper.selectById(pageWrap.getModel().getMemberId());
+ if(!Objects.isNull(member)){
+ pageWrap.getModel().setMemberName(member.getName());
+ pageWrap.getModel().setIdcardNo(member.getIdcardNo());
+ }
queryWrapper.lambda().eq(MemberInsurance::getMemberId, pageWrap.getModel().getMemberId());
}
if (pageWrap.getModel().getEndTime() != null) {
@@ -128,10 +141,6 @@
}
if (pageWrap.getModel().getStartTime() != null) {
queryWrapper.lambda().eq(MemberInsurance::getStartTime, pageWrap.getModel().getStartTime());
- }
- if (pageWrap.getModel().getIdcardNo() != null) {
- queryWrapper.lambda().ge(MemberInsurance::getIdcardNo, Utils.Date.getStart(pageWrap.getModel().getIdcardNo()));
- queryWrapper.lambda().le(MemberInsurance::getIdcardNo, Utils.Date.getEnd(pageWrap.getModel().getIdcardNo()));
}
if (pageWrap.getModel().getDuId() != null) {
queryWrapper.lambda().eq(MemberInsurance::getDuId, pageWrap.getModel().getDuId());
@@ -176,6 +185,8 @@
return PageData.from(memberInsuranceMapper.selectPage(page, queryWrapper));
}
+
+
@Override
public long count(MemberInsurance memberInsurance) {
QueryWrapper<MemberInsurance> wrapper = new QueryWrapper<>(memberInsurance);
--
Gitblit v1.9.3