From 4555d41a66b83c8eb61bd99faf473985aeffda1f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 01 二月 2024 09:11:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/MemberInsuranceServiceImpl.java | 7 +++----
1 files changed, 3 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..5887e9c 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
@@ -83,6 +83,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);
}
@@ -129,10 +130,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 +173,8 @@
return PageData.from(memberInsuranceMapper.selectPage(page, queryWrapper));
}
+
+
@Override
public long count(MemberInsurance memberInsurance) {
QueryWrapper<MemberInsurance> wrapper = new QueryWrapper<>(memberInsurance);
--
Gitblit v1.9.3