From 4839d3bb3671a61e8952077dd978c2a6d2b01bad Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 13:54:20 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index 619f502..c3c2cfa 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -290,34 +290,35 @@
selectList(new QueryWrapper<Notices>().lambda()
.ge(noticesDTO.getStartDate() != null, Notices::getCreateDate, Utils.Date.getStart(noticesDTO.getStartDate() ))
.le(noticesDTO.getEndDate() != null, Notices::getCreateDate, Utils.Date.getEnd(noticesDTO.getEndDate() ))
+ .eq(noticesDTO.getType() != null, Notices::getType, noticesDTO.getType())
.eq(Notices::getUserId,noticesDTO.getMemberId()).orderByDesc(Notices::getCreateDate)
);
internalHomeVO.setTaskNum(noticesList.size());
- if(CollectionUtils.isNotEmpty(noticesList)){
- //寰呮垜澶勭悊鐨勬暟鎹�
- internalHomeVO.setNoticeWaitNum(
- noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),noticesDTO.getMemberId())
- &&Constants.equalsInteger(i.getStatus(),Constants.ZERO)
- &&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
- ).count()
- );
- internalHomeVO.setNoticeDealNum(
- noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),noticesDTO.getMemberId())
- &&Constants.equalsInteger(i.getStatus(),Constants.ONE)
- &&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
- ).count()
- );
+ if(CollectionUtils.isNotEmpty(noticesList)){
+ //寰呮垜澶勭悊鐨勬暟鎹�
+ internalHomeVO.setNoticeWaitNum(
+ noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),noticesDTO.getMemberId())
+ &&Constants.equalsInteger(i.getStatus(),Constants.ZERO)
+ &&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
+ ).count()
+ );
+ internalHomeVO.setNoticeDealNum(
+ noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),noticesDTO.getMemberId())
+ &&Constants.equalsInteger(i.getStatus(),Constants.ONE)
+ &&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
+ ).count()
+ );
- internalHomeVO.setNoticeCreateNum(
- noticesJoinMapper.selectCount(new QueryWrapper<Notices>().lambda().eq(Notices::getParam3,noticesDTO.getMemberId()))
- );
+ internalHomeVO.setNoticeCreateNum(
+ noticesJoinMapper.selectCount(new QueryWrapper<Notices>().lambda().eq(Notices::getParam3,noticesDTO.getMemberId()))
+ );
- internalHomeVO.setNoticeCopyNum(
- noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),noticesDTO.getMemberId())
- &&Constants.equalsInteger(i.getSendacopy(),Constants.ONE)
- ).count()
- );
- }
+ internalHomeVO.setNoticeCopyNum(
+ noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),noticesDTO.getMemberId())
+ &&Constants.equalsInteger(i.getSendacopy(),Constants.ONE)
+ ).count()
+ );
+ }
return internalHomeVO;
}
--
Gitblit v1.9.3