From 73af3ed9fbcc616cdecc739fc4307163c19c5764 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 07 六月 2024 14:35:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 57 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 30 insertions(+), 27 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 af762bd..62379b0 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
@@ -236,42 +236,45 @@
/**
* 鍐呴儴浜哄憳H5椤甸潰棣栭〉
* @param memberId
+ * @param isDetail 鏄惁鏌ヨ璇︾粏 1鏄紱0鍚�
* @return
*/
@Override
- public InternalHomeVO getHomeData(Integer memberId){
+ public InternalHomeVO getHomeData(Integer memberId,Integer isDetail){
InternalHomeVO internalHomeVO = new InternalHomeVO();
internalHomeVO.setHomeImg(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.HOME_IMAGE).getCode());
- internalHomeVO.setTaskNum(approveMapper.selectCount(new QueryWrapper<Approve>().lambda().eq(Approve::getChekorId,memberId).eq(Approve::getStatus,Constants.ZERO)));
//浠诲姟鏁版嵁
- List<Notices> noticesList = noticesJoinMapper.selectList(new QueryWrapper<Notices>().lambda().eq(Notices::getUserId,memberId).orderByDesc(Notices::getCreateDate));
- if(CollectionUtils.isNotEmpty(noticesList)){
- //寰呮垜澶勭悊鐨勬暟鎹�
- internalHomeVO.setNoticeWaitNum(
- noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
- &&Constants.equalsInteger(i.getStatus(),Constants.ZERO)
- &&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
- ).count()
- );
- internalHomeVO.setNoticeDealNum(
- noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
- &&Constants.equalsInteger(i.getStatus(),Constants.ONE)
- &&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
- ).count()
- );
+ List<Notices> noticesList = noticesJoinMapper.
+ selectList(new QueryWrapper<Notices>().lambda()
+ .eq(Notices::getUserId,memberId).orderByDesc(Notices::getCreateDate));
+ internalHomeVO.setTaskNum(noticesList.size());
+ if(Constants.equalsInteger(Constants.ONE,isDetail)){
+ if(CollectionUtils.isNotEmpty(noticesList)){
+ //寰呮垜澶勭悊鐨勬暟鎹�
+ internalHomeVO.setNoticeWaitNum(
+ noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
+ &&Constants.equalsInteger(i.getStatus(),Constants.ZERO)
+ &&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
+ ).count()
+ );
+ internalHomeVO.setNoticeDealNum(
+ noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
+ &&Constants.equalsInteger(i.getStatus(),Constants.ONE)
+ &&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
+ ).count()
+ );
- internalHomeVO.setNoticeCreateNum(
- noticesJoinMapper.selectCount(new QueryWrapper<Notices>().lambda().eq(Notices::getParam3,memberId))
- );
+ internalHomeVO.setNoticeCreateNum(
+ noticesJoinMapper.selectCount(new QueryWrapper<Notices>().lambda().eq(Notices::getParam3,memberId))
+ );
- internalHomeVO.setNoticeCopyNum(
- noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
- &&Constants.equalsInteger(i.getSendacopy(),Constants.ONE)
- ).count()
- );
+ internalHomeVO.setNoticeCopyNum(
+ noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
+ &&Constants.equalsInteger(i.getSendacopy(),Constants.ONE)
+ ).count()
+ );
+ }
}
-
-
return internalHomeVO;
}
--
Gitblit v1.9.3