From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 09:03:01 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/MemberInsuranceServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 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..335ea94 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;
@@ -15,7 +17,9 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 鍛樺伐鎶曚繚鏄庣粏璁板綍Service瀹炵幇
@@ -27,6 +31,9 @@
@Autowired
private MemberInsuranceMapper memberInsuranceMapper;
+
+ @Autowired
+ private MemberMapper memberMapper;
@Override
public Integer create(MemberInsurance memberInsurance) {
@@ -83,9 +90,28 @@
public List<MemberInsurance> findList(MemberInsurance memberInsurance) {
memberInsurance.setIsdeleted(Constants.ZERO);
QueryWrapper<MemberInsurance> wrapper = new QueryWrapper<>(memberInsurance);
+ wrapper.orderByDesc("CREATE_DATE");
return memberInsuranceMapper.selectList(wrapper);
}
-
+
+
+ @Override
+ public List<MemberInsurance> getList(MemberInsurance memberInsurance) {
+ memberInsurance.setIsdeleted(Constants.ZERO);
+ QueryWrapper<MemberInsurance> wrapper = new QueryWrapper<>(memberInsurance);
+ if(!Objects.isNull(memberInsurance.getStatus())){
+ if(memberInsurance.getStatus().equals(Constants.ZERO)){
+ wrapper.lambda().ge(MemberInsurance::getStartTime,new Date());
+ }else{
+ wrapper.lambda().le(MemberInsurance::getStartTime,new Date());
+ }
+ }
+ wrapper.lambda().orderByDesc(MemberInsurance::getCreateDate);
+ return memberInsuranceMapper.selectList(wrapper);
+ }
+
+
+
@Override
public PageData<MemberInsurance> findPage(PageWrap<MemberInsurance> pageWrap) {
IPage<MemberInsurance> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -121,6 +147,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 +160,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());
@@ -173,12 +201,20 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(memberInsuranceMapper.selectPage(page, queryWrapper));
+ PageData<MemberInsurance> pageData = PageData.from(memberInsuranceMapper.selectPage(page, queryWrapper));
+
+ return pageData;
}
+
+
@Override
public long count(MemberInsurance memberInsurance) {
QueryWrapper<MemberInsurance> wrapper = new QueryWrapper<>(memberInsurance);
return memberInsuranceMapper.selectCount(wrapper);
}
+
+
+
+
}
--
Gitblit v1.9.3