From 6c82e309443f491eda73a95c01386becec69224b Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 24 九月 2025 16:00:37 +0800
Subject: [PATCH] 自动叫号业务与WMS获取车辆是否在园接口
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 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 e380400..cc6c81d 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
@@ -72,14 +72,14 @@
if(loginUserInfo == null){
loginUserInfo = model.getLoginUserInfo();
}
- if(StringUtils.isBlank(model.getCode())
+ /* if(StringUtils.isBlank(model.getCode())
||model.getType()==null
||model.getCateId()==null
||model.getType()<0
||model.getType()>3
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
+ }*/
if(model.getMemberId()!=null){
//妫�鏌ヨ溅涓讳俊鎭�
@@ -268,7 +268,7 @@
if(loginUserInfo == null){
loginUserInfo = model.getLoginUserInfo();
}
- if(StringUtils.isBlank(model.getCode())
+ /* if(StringUtils.isBlank(model.getCode())
||model.getId()==null
||model.getType()==null
||model.getCateId()==null
@@ -276,7 +276,7 @@
||model.getType()>3
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
+ }*/
Cars car = carJoinMapper.selectById(model.getId());
if(car ==null ||Constants.equalsInteger(car.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝杞﹁締淇℃伅涓嶅瓨鍦紒");
@@ -355,10 +355,25 @@
@Override
public List<Cars> findList(Cars cars) {
+ if(Objects.nonNull(cars)
+ && Constants.equalsInteger(Constants.ZERO,cars.getType())){
+ return this.getGwCar();
+ }
QueryWrapper<Cars> wrapper = new QueryWrapper<>(cars);
wrapper.lambda().eq(Cars::getIsdeleted,Constants.ZERO);
return carsMapper.selectList(wrapper);
}
+
+ public List<Cars> getGwCar(){
+ List<Cars> list = carsMapper.selectJoinList(Cars.class,
+ new MPJLambdaWrapper<Cars>().selectAll(Cars.class)
+ .leftJoin(Category.class,Category::getId,Cars::getCateId)
+ .eq(Category::getBizType,Constants.FOUR)
+ .eq(Cars::getIsdeleted,Constants.ZERO)
+ );
+ return list;
+ }
+
@Override
public PageData<Cars> findPage(PageWrap<Cars> pageWrap) {
@@ -532,7 +547,7 @@
model.setPhone(ScientificNotationTUtil.convertToString(model.getPhone()));
if(StringUtils.isBlank(model.getCode())
&&StringUtils.isBlank(model.getCategoryName())
- &&StringUtils.isBlank(model.getType())
+// &&StringUtils.isBlank(model.getType())
&&StringUtils.isBlank(model.getSex())
&&StringUtils.isBlank(model.getIdcard())
&&StringUtils.isBlank(model.getParkName())
@@ -577,7 +592,7 @@
,List<Company> companyList
,List<Category> categoryList ) {
if(StringUtils.isBlank(model.getCode())
- ||StringUtils.isBlank(model.getType())
+// ||StringUtils.isBlank(model.getType())
||StringUtils.isBlank(model.getCategoryName())
||StringUtils.isBlank(model.getCompanyName())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+2)+"琛岃溅杈嗕俊鎭笉瀹屾暣锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
@@ -605,14 +620,14 @@
cars.setIsnew(Constants.ZERO);
updateList.add(cars);
}
- //绫诲瀷 0瀹夋嘲鍏姟杞� 1瀹夋嘲鑷湁鐗╂祦杞� 2鍏跺畠
+ /* //绫诲瀷 0瀹夋嘲鍏姟杞� 1瀹夋嘲鑷湁鐗╂祦杞� 2鍏跺畠
if(StringUtils.equals(model.getType(),"瀹夋嘲鍏姟杞�")){
cars.setType(Constants.ZERO);
}else if(StringUtils.equals(model.getType(),"瀹夋嘲鑷湁鐗╂祦杞�")){
cars.setType(Constants.ONE);
}else{
cars.setType(Constants.TWO);
- }
+ }*/
cars.setCode(model.getCode());
Company company = findCompanyFromList(model.getCompanyName(),companyList);
if(company == null){
--
Gitblit v1.9.3