From b23a7cc13d3cac4a92dae9a454caa5d315318472 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 01 十一月 2024 14:01:42 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java |   26 ++++++++------------------
 1 files changed, 8 insertions(+), 18 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 7d1f53c..85ed8b2 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
@@ -17,6 +17,7 @@
 import com.doumee.core.utils.Utils;
 import com.doumee.dao.business.*;
 import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dao.SmsEmailMapper;
 import com.doumee.dao.business.dto.ApproveDTO;
 import com.doumee.dao.business.join.ApproveJoinMapper;
 import com.doumee.dao.business.join.CarUseBookJoinMapper;
@@ -40,7 +41,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -103,44 +103,32 @@
     private PlatformReasonMapper platformReasonMapper;
     @Autowired
     private PlatformGroupMapper platformGroupMapper;
-
-
     @Autowired
     private ParksMapper parksMapper;
-
     @Autowired
     private ParkBookMapper parkBookMapper;
-
     @Autowired
     private VisitParkMapper visitParkMapper;
-
     @Autowired
     private SmsConfigMapper smsConfigMapper;
-
     @Autowired
     private SmsEmailMapper smsEmailMapper;
-
     @Autowired
     private EmayService emayService;
-
-
     @Override
     public Integer create(Approve approve) {
         approveMapper.insert(approve);
         return approve.getId();
     }
-
     @Override
     public void deleteById(Integer id) {
         approveMapper.deleteById(id);
     }
-
     @Override
     public void delete(Approve approve) {
         UpdateWrapper<Approve> deleteWrapper = new UpdateWrapper<>(approve);
         approveMapper.delete(deleteWrapper);
     }
-
     @Override
     public void deleteByIdInBatch(List<Integer> ids) {
         if (CollectionUtils.isEmpty(ids)) {
@@ -285,14 +273,16 @@
             if(CollectionUtils.isNotEmpty(noticesList)){
                 //寰呮垜澶勭悊鐨勬暟鎹�
                 internalHomeVO.setNoticeWaitNum(
-                        noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
+                        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)
+                        noticesList.stream().filter(i->
+                                Constants.equalsInteger(i.getUserId(),memberId)
                                 &&StringUtils.equals(i.getParam4(),i.getUserId().toString())
                                 &&Constants.equalsInteger(i.getStatus(),Constants.ONE)
                                 &&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
@@ -303,9 +293,10 @@
                         noticesJoinMapper.selectCount(new QueryWrapper<Notices>().lambda().eq(Notices::getParam3,memberId))
                 );
                 //鎶勯�佹垜鐨勬暟鎹�
-                internalHomeVO.setNoticeCopyNum(
+                 internalHomeVO.setNoticeCopyNum(
                         noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
                                 &&Constants.equalsInteger(i.getSendacopy(),Constants.ONE)
+                                &&Constants.equalsInteger(i.getReaded(),Constants.ZERO)
                         ).count()
                 );
             }
@@ -563,7 +554,7 @@
                 approve.setTemplatId(approveTempl.getId());
                 approve.setChekorId(memberId);
                 approve.setStatus(i==0?Constants.ONE:Constants.ZERO);
-                approve.setStatusInfo(i==0?"瀹℃壒涓�":"澶勭悊涓�");
+                approve.setStatusInfo(i==0?"瀹℃壒涓�":"寰呭鐞�");
                 approve.setTitle(StringUtils.isBlank(approveParam.getRemark())?"瀹℃壒涓�":approveParam.getRemark());
                 approve.setIsEndCheck((i+1) == approveParamList.size()?Constants.ONE:Constants.ZERO);
                 approve.setObjId(businessId);
@@ -921,7 +912,6 @@
                 }else{
                     waitModel.setStatus(level.getStatus());
                     waitModel.setType(Constants.ZERO);
-                    //waitModel.setStatusInfo(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉");
                     waitModel.setTitle(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉");
 
                 }

--
Gitblit v1.9.3