From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java
index 22a4e05..142c846 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java
@@ -200,6 +200,9 @@
if (pageWrap.getModel().getId() != null) {
queryWrapper.eq(News::getId, pageWrap.getModel().getId());
}
+ if(pageWrap.getModel().getIsPublish()!=null && Constants.equalsInteger(pageWrap.getModel().getIsPublish(),Constants.ONE)){
+ queryWrapper.apply(" now() >= t.PUBLISH_DATE ");
+ }
if (pageWrap.getModel().getCreator() != null) {
queryWrapper.eq(News::getCreator, pageWrap.getModel().getCreator());
}
@@ -386,14 +389,29 @@
newsMapper.selectCount(new QueryWrapper<News>().lambda()
.eq(News::getIsdeleted,Constants.ZERO)
.like(News::getCreateDate, DateUtil.getDateLong(new Date()))
+ .apply(" now() >= PUBLISH_DATE ")
.eq(News::getType,Constants.ZERO)
));
dailyUpdatesResponse.setShareNum(
actionsMapper.selectCount(new QueryWrapper<Actions>())
);
- dailyUpdatesResponse.setNewsList(
- this.getCustomizedNewsList(Constants.ZERO,Constants.THREE,Constants.ZERO)
+ List<News> list = newsMapper.selectList(new QueryWrapper<News>().lambda()
+ .eq(News::getIsdeleted,Constants.ZERO)
+ .eq(News::getType,Constants.ZERO)
+ .eq(News::getStatus,Constants.ZERO)
+ .eq(News::getFileType,Constants.ZERO)
+ .apply(" now() >= PUBLISH_DATE ")
+ .last( "limit 3" )
+ .orderByDesc(News::getCreateDate)
);
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
+ List<Long> idList = list.stream().map(i->i.getId()).collect(Collectors.toList());
+ List<Multifile> files = dealMultifileList(idList);
+ for(News model : list){
+ setFilelistById(model,files);
+ }
+ }
+ dailyUpdatesResponse.setNewsList(list);
return dailyUpdatesResponse;
}
--
Gitblit v1.9.3