From ecbdab9da9488cc58a1ac7064f9cffde4792fba4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 六月 2024 09:51:01 +0800
Subject: [PATCH] 代码初始化

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java |   91 ++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 76 insertions(+), 15 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 41dc926..ecb91fd 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
@@ -18,6 +18,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;
@@ -240,7 +241,7 @@
      * @return
      */
     @Override
-    public InternalHomeVO getHomeData(Integer memberId,Integer isDetail){
+    public InternalHomeVO getHomeDataH5(Integer memberId,Integer isDetail){
         InternalHomeVO internalHomeVO = new InternalHomeVO();
         internalHomeVO.setHomeImg(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.HOME_IMAGE).getCode());
         //浠诲姟鏁版嵁
@@ -279,6 +280,49 @@
         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;
+    }
 
     /**
      * 鍒涘缓瀹℃壒娴佺▼
@@ -705,6 +749,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){
@@ -731,6 +778,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);
@@ -1012,8 +1062,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())
                 );
                 //淇敼 鏈鐞嗙殑 閫氱煡鏁版嵁 涓烘妱閫�
@@ -1021,7 +1073,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)
@@ -1035,19 +1088,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()
@@ -1064,7 +1121,7 @@
                     dealBusinessBean = true;
                 }
             }
-            this.passNextNotices(dealBusinessBean,notices,approve,approveList,approveCopyList);
+            this.passNextNotices(dealBusinessBean,notices,approve,approveList,approveCopyList,approveDTO);
         }
         //澶勭悊涓氬姟鏁版嵁
         if(dealBusinessBean){
@@ -1078,12 +1135,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)){
@@ -1093,7 +1152,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