|
|
@@ -329,7 +329,7 @@ public class NewsController {
|
|
|
.eq(News::getStatus, 2)
|
|
|
.gt(News::getSendEndDate, LocalDateTime.now())
|
|
|
.eq(News::getWfStatus, 1)
|
|
|
- .notIn(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 and user_id = " + StpUtil.getLoginIdAsLong()));
|
|
|
+ .notInSql(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 and user_id = " + StpUtil.getLoginIdAsLong()));
|
|
|
|
|
|
newsCountTypeVo.setTypeId(typeId);
|
|
|
newsCountTypeVo.setTotal(notReadCount);
|
|
|
@@ -339,7 +339,7 @@ public class NewsController {
|
|
|
.eq(News::getStatus, 2)
|
|
|
.gt(News::getSendEndDate, LocalDateTime.now())
|
|
|
.eq(News::getWfStatus, 1)
|
|
|
- .notIn(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 and user_id = " + StpUtil.getLoginIdAsLong())
|
|
|
+ .notInSql(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 and user_id = " + StpUtil.getLoginIdAsLong())
|
|
|
.orderByDesc(News::getReleaseTime)
|
|
|
.last("limit 1"));
|
|
|
}
|
|
|
@@ -351,7 +351,7 @@ public class NewsController {
|
|
|
.eq(News::getTypeId, 2)
|
|
|
.eq(News::getStatus, 2)
|
|
|
.eq(News::getSendRange, 1)
|
|
|
- .notIn(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 and user_id = " + StpUtil.getLoginIdAsLong())
|
|
|
+ .notInSql(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 and user_id = " + StpUtil.getLoginIdAsLong())
|
|
|
.and(wp -> wp.gt(News::getSendEndDate, LocalDateTime.now())
|
|
|
.or()
|
|
|
.isNull(News::getSendEndDate)));
|
|
|
@@ -360,7 +360,7 @@ public class NewsController {
|
|
|
.eq(News::getTypeId, 2)
|
|
|
.eq(News::getStatus, 2)
|
|
|
.eq(News::getSendRange, 1)
|
|
|
- .notIn(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 and user_id = " + StpUtil.getLoginIdAsLong())
|
|
|
+ .notInSql(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 and user_id = " + StpUtil.getLoginIdAsLong())
|
|
|
.and(wp -> wp.gt(News::getSendEndDate, LocalDateTime.now())
|
|
|
.or()
|
|
|
.isNull(News::getSendEndDate))
|
|
|
@@ -371,7 +371,7 @@ public class NewsController {
|
|
|
Long notReadCountProclamation = newsRelationService.count(Wrappers.<NewsRelation>query().lambda()
|
|
|
.eq(NewsRelation::getReadMark, 2)
|
|
|
.eq(NewsRelation::getUserId, 2)
|
|
|
- .in(NewsRelation::getNewsId, "select id from xjr_oa_news where delete_mark = 0 and type_id = 2 and (send_range = 2 or send_range = 3) AND (send_end_date > '" + LocalDateTime.now() + "' OR send_end_date IS NULL)"));
|
|
|
+ .inSql(NewsRelation::getNewsId, "select id from xjr_oa_news where delete_mark = 0 and type_id = 2 and (send_range = 2 or send_range = 3) AND (send_end_date > '" + LocalDateTime.now() + "' OR send_end_date IS NULL)"));
|
|
|
|
|
|
|
|
|
MPJLambdaWrapper<News> queryNews = new MPJLambdaWrapper<>();
|
|
|
@@ -413,7 +413,7 @@ public class NewsController {
|
|
|
|
|
|
if (news != null) {
|
|
|
newsCountTypeVo.setTime(news.getReleaseTime());
|
|
|
- newsCountTypeVo.setTitle(news.getBriefHead());
|
|
|
+ newsCountTypeVo.setTitle(news.getFullHead());
|
|
|
}
|
|
|
newsCountTypeVoList.add(newsCountTypeVo);
|
|
|
}
|
|
|
@@ -434,14 +434,14 @@ public class NewsController {
|
|
|
.eq(News::getStatus, 2)
|
|
|
.gt(News::getSendEndDate, LocalDateTime.now())
|
|
|
.eq(News::getWfStatus, 1)
|
|
|
- .notIn(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 user_id = " + StpUtil.getLoginIdAsLong()));
|
|
|
+ .notInSql(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 and user_id = " + StpUtil.getLoginIdAsLong()));
|
|
|
|
|
|
//公告发给全体的
|
|
|
Long notReadCountProclamationToAll = newsService.count(Wrappers.<News>query().lambda()
|
|
|
.eq(News::getTypeId, 2)
|
|
|
.eq(News::getStatus, 2)
|
|
|
.eq(News::getSendRange, 1)
|
|
|
- .notIn(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 and user_id = " + StpUtil.getLoginIdAsLong())
|
|
|
+ .notInSql(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 and user_id = " + StpUtil.getLoginIdAsLong())
|
|
|
.and(wp -> wp.gt(News::getSendEndDate, LocalDateTime.now())
|
|
|
.or()
|
|
|
.isNull(News::getSendEndDate)));
|
|
|
@@ -450,7 +450,7 @@ public class NewsController {
|
|
|
Long notReadCountProclamation = newsRelationService.count(Wrappers.<NewsRelation>query().lambda()
|
|
|
.eq(NewsRelation::getReadMark, 2)
|
|
|
.eq(NewsRelation::getUserId, 2)
|
|
|
- .in(NewsRelation::getNewsId, "select id from xjr_oa_news where delete_mark = 0 and type_id = 2 and status = 2 and (send_range = 2 or send_range = 3) AND (send_end_date > '" + LocalDateTime.now() + "' OR send_end_date IS NULL)"));
|
|
|
+ .inSql(NewsRelation::getNewsId, "select id from xjr_oa_news where delete_mark = 0 and type_id = 2 and status = 2 and (send_range = 2 or send_range = 3) AND (send_end_date > '" + LocalDateTime.now() + "' OR send_end_date IS NULL)"));
|
|
|
|
|
|
Long notReadCount = notReadCountNews + notReadCountProclamationToAll + notReadCountProclamation;
|
|
|
return RT.ok(notReadCount);
|
fanxp