From bd28e0ab635f43b608df6a2ab1823dcc6f78da93 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 01 二月 2024 20:46:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/MemberInsuranceServiceImpl.java | 9 +++++----
1 files changed, 5 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 13e7166..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
@@ -2,6 +2,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.MemberInsuranceMapper;
import com.doumee.dao.business.model.MemberInsurance;
@@ -80,7 +81,9 @@
@Override
public List<MemberInsurance> findList(MemberInsurance memberInsurance) {
+ memberInsurance.setIsdeleted(Constants.ZERO);
QueryWrapper<MemberInsurance> wrapper = new QueryWrapper<>(memberInsurance);
+ wrapper.orderByDesc("CREATE_DATE");
return memberInsuranceMapper.selectList(wrapper);
}
@@ -127,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());
}
@@ -174,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