From 77be404d9d2b3fa11c7ba0890dcdf2bb0b5d6a1c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 31 十月 2024 17:14:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
index 2d61cee..3dc31e2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
@@ -64,6 +64,7 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+
if(model.getMemberId()!=null){
//妫�鏌ヨ溅涓讳俊鎭�
Member member =memberMapper.selectOne(new QueryWrapper<Member>().lambda()
@@ -76,6 +77,10 @@
}
model.setMemberHkId(member.getHkId());
}
+ if(!Constants.checkCarNo(model.getCode())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇疯緭鍏ユ纭殑杞︾墝!");
+ };
+
//妫�鏌ヨ溅鐗屽彿鏄惁閲嶅
if(carsMapper.selectCount(new QueryWrapper<Cars>().lambda()
.eq(Cars::getCode,model.getCode() )
@@ -193,8 +198,10 @@
Cars car = carJoinMapper.selectById(model.getId());
if(car ==null ||Constants.equalsInteger(car.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝杞﹁締淇℃伅涓嶅瓨鍦紒");
-
}
+ if(!Constants.checkCarNo(model.getCode())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇疯緭鍏ユ纭殑杞︾墝!");
+ };
if(model.getMemberId()!=null){
//妫�鏌ヨ溅涓讳俊鎭�
Member member =memberMapper.selectOne(new QueryWrapper<Member>().lambda()
@@ -222,7 +229,7 @@
model.setHkStatus(Constants.ZERO);
model.setRemark("");
model.setAuthStatus(Constants.ZERO);
- dealCancelBookBiz(model.getCode(),model.getEditDate());
+ dealCancelBookBiz(car.getCode(),model.getEditDate());
carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
.eq(Cars::getId,model.getId())
.set(Cars::getAuthStatus,Constants.ZERO)
@@ -300,6 +307,18 @@
queryWrapper.eq(pageWrap.getModel().getType()!=null,Cars::getType,pageWrap.getModel().getType());
queryWrapper.eq(pageWrap.getModel().getAuthStatus()!=null,Cars::getAuthStatus,pageWrap.getModel().getAuthStatus());
queryWrapper.orderByDesc(Cars::getCreateDate);
+ //鏁版嵁鏉冮檺寮�濮�--------------------start----------------
+ LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
+ if(userInfo!=null && userInfo.getCompanyIdList()!=null){
+ if( userInfo.getCompanyIdList().size() ==0){
+ //鍙兘鐪嬭嚜宸�(鎷滆浜猴級
+ queryWrapper.eq(Cars::getMemberId,userInfo.getMemberId());
+ }else{
+ queryWrapper.in(Cars::getGroupId ,userInfo.getCompanyIdList());
+ }
+ }
+ //鏁版嵁鏉冮檺寮�濮�--------------------end----------------
+
IPage<Cars> result = carJoinMapper.selectJoinPage(page, Cars.class,queryWrapper);
if(result!=null && result.getRecords()!=null && result.getRecords().size()>0){
List<String> codes = new ArrayList<>();
--
Gitblit v1.9.3