From 09da100729793848bc01b51f7b05ca3f1e7ec64f Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 20 六月 2024 14:05:35 +0800 Subject: [PATCH] 提交一把 --- server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 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..477a813 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 @@ -114,6 +114,7 @@ queryWrapper.selectAll(Notices.class); queryWrapper.selectAs(Company::getName,Notices::getCompanyName); queryWrapper.leftJoin(Company.class,Company::getId,Notices::getCompanyId); + queryWrapper.eq(Notices::getType, Constants.NoticeType.SIX.getStatus()); if (pageWrap.getModel().getIsdeleted() != null) { queryWrapper.eq(Notices::getIsdeleted, pageWrap.getModel().getIsdeleted()); } @@ -145,6 +146,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())){ -- Gitblit v1.9.3