From 7e4cb4eeca9f5f9d6d0e38adaf0522f2473d767f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 01 十一月 2024 15:22:48 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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..afef571 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;
@@ -285,14 +285,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 +305,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 +566,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);
@@ -788,6 +791,9 @@
* @param objLevel 鏌ヨ绾у埆
*/
public Company getAuditCompanyHead(Integer companyId, Integer objLevel){
+ if(Objects.isNull(objLevel)||Objects.isNull(companyId)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒娴侀厤缃紓甯革紝璇疯仈绯荤鐞嗗憳");
+ }
Company auditCompany = companyMapper.selectById(companyId);
Integer queryLevel = Constants.ONE;
while(queryLevel<objLevel){
@@ -921,7 +927,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(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉");
}
@@ -1703,7 +1708,7 @@
if(approveDTO.getStatus()==Constants.TWO&&Constants.equalsInteger(approve.getDriverParam(),Constants.ONE)){
CarDriver carDriver = carDriverMapper.selectOne(new QueryWrapper<CarDriver>().lambda()
.eq(CarDriver::getIsdeleted,Constants.ZERO)
- .eq(CarDriver::getStatus,Constants.ZERO)
+// .eq(CarDriver::getStatus,Constants.ZERO)
.eq(CarDriver::getMemberId,approveDTO.getDriverId()));
if(Objects.isNull(carDriver)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鍙告満淇℃伅");
--
Gitblit v1.9.3