From 820af5a78a30fb03eec4adaa2f1ffbc517e623d2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 六月 2024 10:37:58 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java
index d6651fd..108a8c3 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java
@@ -7,10 +7,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.NoticesMapper;
import com.doumee.dao.business.join.NoticesJoinMapper;
-import com.doumee.dao.business.model.ApplyChagneDetail;
-import com.doumee.dao.business.model.Company;
-import com.doumee.dao.business.model.InsuranceApply;
-import com.doumee.dao.business.model.Notices;
+import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ApplyNoticeVO;
import com.doumee.service.business.NoticesService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -114,6 +111,8 @@
queryWrapper.selectAll(Notices.class);
queryWrapper.selectAs(Company::getName,Notices::getCompanyName);
queryWrapper.leftJoin(Company.class,Company::getId,Notices::getCompanyId);
+ queryWrapper.ne(Notices::getType, Constants.NoticeType.SIX.getStatus());
+ queryWrapper.eq(Notices::getIsdeleted,Constants.ZERO);
if (pageWrap.getModel().getIsdeleted() != null) {
queryWrapper.eq(Notices::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
@@ -145,6 +144,12 @@
queryWrapper.in(Notices::getObjType,new Integer[]{Constants.NoticeObjectType.TAXES.getKey() });
} else if(pageWrap.getModel().getQueryType().equals(Constants.TWO)){
queryWrapper.in(Notices::getObjType,new Integer[]{Constants.NoticeObjectType.SETTLE_CLAIMS.getKey() });
+ }else if(pageWrap.getModel().getQueryType().equals(Constants.THREE)){
+ //濮旀墭淇濅唬鍔�
+ queryWrapper.notIn(Notices::getType,new Integer[]{Constants.NoticeType.SEVEN.getStatus() });
+ }else if(pageWrap.getModel().getQueryType().equals(Constants.FOUR)){
+ //濮旀墭淇濅唬鍔�
+ queryWrapper.in(Notices::getType,new Integer[]{Constants.NoticeType.SEVEN.getStatus() });
}
}
if(CollectionUtils.isNotEmpty(pageWrap.getSorts())){
@@ -192,6 +197,7 @@
.eq(Notices::getCompanyId,companyId)
.eq(Notices::getObjType,Constants.NoticeObjectType.INSURANCE_APPLY.getKey())
.eq(Notices::getStatus,Constants.ZERO)
+ .eq(Notices::getIsdeleted,Constants.ZERO)
.in(Notices::getType,Constants.NoticeType.SIX.getStatus(),Constants.NoticeType.ONE.getStatus())
);
if(CollectionUtils.isNotEmpty(noticesList)){
--
Gitblit v1.9.3