From a28aab6e2006e56da48076c2447bce2676f888ea Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 03 六月 2024 16:23:22 +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, 9 insertions(+), 10 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 09b02ab..19b432d 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
@@ -713,7 +713,8 @@
if(Constants.equalsInteger(approve.getType(),Constants.ONE)){
continue;
}
- if(Constants.equalsInteger(approve.getChekorId(),memberId)){
+ if(Constants.equalsInteger(approve.getChekorId(),memberId)
+ &&Constants.equalsInteger(approve.getStatus(), Constants.ONE)){
approveDataVO.setCanBeApproved(Constants.ONE);
approveDataVO.setDriverParam(approve.getDriverParam());
}
@@ -721,11 +722,9 @@
approveList.add(approve);
}
}
-
if(CollectionUtils.isEmpty(approveList)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒淇℃伅锛氱骇鍒暟鎹紓甯�");
}
-
return approveList;
}
@@ -779,8 +778,6 @@
.orderByAsc(Approve::getLevel)
.orderByAsc(Approve::getId)
);
-
-
String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
for (Approve approve:approveAllList ) {
@@ -866,6 +863,9 @@
.lambda()
.eq(Approve::getObjId,approveDTO.getObjId())
.eq(Approve::getObjType,approveDTO.getObjType())
+ .eq(Approve::getChekorId,approveDTO.getLoginUserInfo().getMemberId())
+ .eq(Approve::getType,Constants.ZERO)
+ .eq(Approve::getStatus,Constants.approveStatus.auditIng)
.last(" limit 1")
);
if(Objects.isNull(approve)){
@@ -879,9 +879,9 @@
approve.setStatus(approveDTO.getStatus());
approve.setCheckInfo(approveDTO.getCheckInfo());
approve.setCheorId(approveDTO.getLoginUserInfo().getMemberId().toString());
- approve.setCheckorName(approve.getLoginUserInfo().getRealname());
+ approve.setCheckorName(approveDTO.getLoginUserInfo().getRealname());
approve.setCheckDate(new Date());
- approve.setStatusInfo(approveDTO.getStatus()==Constants.TWO?"瀹℃壒閫氳繃":approveDTO.getCheckInfo());
+ approve.setStatusInfo(approveDTO.getStatus()==Constants.TWO?"宸插悓鎰�":approveDTO.getCheckInfo());
Visits visits = new Visits();
CarUseBook carUseBook = new CarUseBook();
this.dealBusinessData(approveDTO,approve,visits,carUseBook);
@@ -962,10 +962,9 @@
}else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
Constants.approveObjectType.unCityUseCar)){
// 甯傚唴澶栫敤杞︾敵璇�
- carUseBookMapper.updateById(carUseBook);
if(dealBusinessBean){
//TODO 鍙戦�佸鎵归�氳繃娑堟伅
-
+ carUseBookMapper.updateById(carUseBook);
}else if(approveDTO.getStatus().equals(Constants.THREE)){
//TODO 瀹℃壒鏈�氳繃閫氱煡
@@ -1062,7 +1061,7 @@
carUseBook.setEditDate(new Date());
carUseBook.setEditor(approveDTO.getLoginUserInfo().getMemberId());
//濡傛灉閰嶇疆淇敼鍙告満 涓� 鍏ュ弬浜嗘洿鎹㈠悗鍙告満淇℃伅
- if(approveDTO.getStatus()==Constants.TWO&&approve.getDriverParam().equals(Constants.ONE)){
+ if(approveDTO.getStatus()==Constants.TWO&&Constants.equalsInteger(approve.getDriverParam(),Constants.ONE)){
CarDriver carDriver = carDriverMapper.selectById(approveDTO.getDriverId());
if(Objects.isNull(carDriver)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鍙告満淇℃伅");
--
Gitblit v1.9.3