From 3a2ef8e35608d82b03f7287025929751668c72cb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 16:31:18 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 165 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 115 insertions(+), 50 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..87ad1ae 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
@@ -1,7 +1,6 @@
package com.doumee.service.business.impl;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.api.R;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -18,6 +17,7 @@
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ApproveDataVO;
+import com.doumee.dao.system.dto.NoticesDTO;
import com.doumee.dao.system.join.NoticesJoinMapper;
import com.doumee.dao.system.model.Notices;
import com.doumee.dao.system.model.SystemUser;
@@ -236,46 +236,92 @@
/**
* 鍐呴儴浜哄憳H5椤甸潰棣栭〉
* @param memberId
+ * @param isDetail 鏄惁鏌ヨ璇︾粏 1鏄紱0鍚�
* @return
*/
@Override
- public InternalHomeVO getHomeData(Integer memberId){
+ public InternalHomeVO getHomeDataH5(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;
}
+
+ @Override
+ public InternalHomeVO getHomeDataPC(NoticesDTO noticesDTO){
+ InternalHomeVO internalHomeVO = new InternalHomeVO();
+ internalHomeVO.setHomeImg(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.HOME_IMAGE).getCode());
+ //浠诲姟鏁版嵁
+ List<Notices> noticesList = noticesJoinMapper.
+ 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()
+ );
+
+ 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()
+ );
+ }
+
+ return internalHomeVO;
+ }
/**
* 鍒涘缓瀹℃壒娴佺▼
@@ -634,13 +680,15 @@
List<Approve> levelList = getLevelListFromResult(approveGroupList,approveDateVO,memberId);
List<Approve> copyList = getAllCopyList(approveGroupList);
//閬嶅巻level鏌ヨ姣忎竴绾у埆涓氬姟鏁版嵁
- for(Approve level:levelList){
- List<Approve> tlist = getLevelInfoFromList(level,approveGroupList);
- approveDateVO.getApproveList().addAll(tlist);
- if(tlist.size() ==0
- ||Constants.equalsInteger(Constants.approveStatus.unPass, tlist.get(0).getStatus())
- ||Constants.equalsInteger(Constants.approveStatus.cancel, tlist.get(0).getStatus())){
- break;
+ if(levelList!=null){
+ for(Approve level:levelList){
+ List<Approve> tlist = getLevelInfoFromList(level,approveGroupList);
+ approveDateVO.getApproveList().addAll(tlist);
+ if(tlist.size() ==0
+ ||Constants.equalsInteger(Constants.approveStatus.unPass, tlist.get(0).getStatus())
+ ||Constants.equalsInteger(Constants.approveStatus.cancel, tlist.get(0).getStatus())){
+ break;
+ }
}
}
@@ -700,6 +748,9 @@
||Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){
waitModel.setMemberName(waitList.size() +"浜轰細绛�");
}
+ if(CollectionUtils.isNotEmpty(waitList)){
+ waitModel.setCreateDate(waitList.get(Constants.ZERO).getCreateDate());
+ }
waitModel.setApproveList(waitList);
list.add(waitModel);
}else if(waitList.size()>0){
@@ -726,6 +777,9 @@
//濡傛灉鏄垨绛�
if(passList.size()>0){
approveList.addAll(otherPassList);
+ }
+ if(CollectionUtils.isNotEmpty(approveList)){
+ waitModel.setCreateDate(approveList.get(Constants.ZERO).getCreateDate());
}
waitModel.setMemberName("宸叉妱閫�"+ approveList.size() +"浜�");
waitModel.setApproveList(approveList);
@@ -796,7 +850,7 @@
}
}
if(CollectionUtils.isEmpty(approveList)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒淇℃伅锛氱骇鍒暟鎹紓甯�");
+ // throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒淇℃伅锛氱骇鍒暟鎹紓甯�");
}
return approveList;
}
@@ -1007,8 +1061,10 @@
//淇敼鑷繁鐨勯�氱煡璁板綍
noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
.set(Notices::getEditDate,new Date())
+ .set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId())
.set(Notices::getReaded,Constants.ONE)
- .set(Notices::getParam2,approve.getStatus())
+ .set(Notices::getParam2,Constants.TWO)
+ .set(Notices::getStatus,Constants.ONE)
.eq(Notices::getId,notices.getId())
);
//淇敼 鏈鐞嗙殑 閫氱煡鏁版嵁 涓烘妱閫�
@@ -1016,7 +1072,8 @@
noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
.set(Notices::getEditDate,new Date())
.set(Notices::getSendacopy,Constants.ONE)
- .set(Notices::getParam2,approve.getStatus())
+ .set(Notices::getStatus,Constants.ONE)
+ .set(Notices::getParam2,Constants.TWO)
.eq(Notices::getObjId,notices.getObjId())
.eq(Notices::getObjType,notices.getObjType())
.eq(Notices::getReaded,Constants.ZERO)
@@ -1030,19 +1087,23 @@
if((Constants.equalsInteger(approve.getApproveType(),Constants.ZERO)
|| Constants.equalsInteger( approve.getApproveType(),Constants.TWO)) && Constants.equalsInteger(approve.getIsEndCheck(),Constants.ONE)){
//鎴栫 / 鍗曚汉瀹� 涓� 缁堝
- approveJoinMapper.update(null,new UpdateWrapper<Approve>()
- .lambda()
- .set(Approve::getStatus,Constants.approveStatus.otherDeal)
- .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList())));
+ if(CollectionUtils.isNotEmpty(approveList)){
+ approveJoinMapper.update(null,new UpdateWrapper<Approve>()
+ .lambda()
+ .set(Approve::getStatus,Constants.approveStatus.otherDeal)
+ .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList())));
+ }
dealBusinessBean = true;
}else if((approve.getApproveType().equals(Constants.ZERO)
|| approve.getApproveType().equals(Constants.TWO)) &&approve.getIsEndCheck()!=Constants.ONE){
//鎴栫 / 鍗曚汉瀹� 闈炵粓瀹� 鍒欏紑鍚笅涓�姝ヤ笟鍔℃祦绋�
/**澶勭悊鏈骇鏁版嵁**/
- approveJoinMapper.update(null,new UpdateWrapper<Approve>()
- .lambda()
- .set(Approve::getStatus,Constants.approveStatus.otherDeal)
- .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList())));
+ if(CollectionUtils.isNotEmpty(approveList)){
+ approveJoinMapper.update(null,new UpdateWrapper<Approve>()
+ .lambda()
+ .set(Approve::getStatus,Constants.approveStatus.otherDeal)
+ .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList())));
+ }
/**寮�鍚笅涓�绾у埆鐨勬暟鎹负寰呭鏍�**/
approveJoinMapper.update(null,new UpdateWrapper<Approve>()
.lambda()
@@ -1059,7 +1120,7 @@
dealBusinessBean = true;
}
}
- this.passNextNotices(dealBusinessBean,notices,approve,approveList,approveCopyList);
+ this.passNextNotices(dealBusinessBean,notices,approve,approveList,approveCopyList,approveDTO);
}
//澶勭悊涓氬姟鏁版嵁
if(dealBusinessBean){
@@ -1073,12 +1134,14 @@
* @param approve 瀹℃壒璁板綍
* @param approveList 鍚岀骇寰呭鎵规暟鎹�
*/
- public void passNextNotices(Boolean dealBusinessBean,Notices notices,Approve approve,List<Approve> approveList,List<Approve> copyList){
+ public void passNextNotices(Boolean dealBusinessBean,Notices notices,Approve approve,List<Approve> approveList,List<Approve> copyList,ApproveDTO approveDTO){
//1銆佷慨鏀硅嚜宸辩殑鏁版嵁璁板綍
noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
.set(Notices::getEditDate,new Date())
.set(Notices::getReaded,Constants.ONE)
- .set(dealBusinessBean,Notices::getParam2,approve.getStatus())
+ .set(Notices::getStatus,Constants.ONE)
+ .set(dealBusinessBean,Notices::getParam2,Constants.ONE)
+ .set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId())
.eq(Notices::getId,notices.getId())
);
if(Constants.equalsInteger(approve.getApproveType(),Constants.ZERO)){
@@ -1088,7 +1151,9 @@
.set(Notices::getEditDate,new Date())
.set(Notices::getReaded,Constants.ONE)
.set(Notices::getSendacopy,Constants.ONE)
- .set(dealBusinessBean,Notices::getParam2,approve.getStatus())
+ .set(Notices::getStatus,Constants.ONE)
+ .set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId())
+ .set(dealBusinessBean,Notices::getParam2,Constants.ONE)
.eq(Notices::getObjId,notices.getObjId())
.eq(Notices::getObjType,notices.getObjType())
.ne(Notices::getId,notices.getId())
--
Gitblit v1.9.3