From 078a5c4ced367fdbd5a16c27c8bada6e44e632d5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 09 十月 2025 16:00:33 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 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 2c5ced4..3b6469b 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
@@ -38,6 +38,7 @@
import java.math.BigDecimal;
import java.util.*;
+import java.util.concurrent.TimeUnit;
/**
* 杞﹁締淇℃伅琛⊿ervice瀹炵幇
@@ -72,14 +73,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){
//妫�鏌ヨ溅涓讳俊鎭�
@@ -108,9 +109,9 @@
model.setCreateDate(new Date());
model.setCreator(loginUserInfo.getId());
model.setEditDate(new Date());
+ model.setIsdeleted(Constants.ZERO);
model.setEdirot(loginUserInfo.getId());
model.setStatus(Constants.ZERO);
- model.setIsdeleted(Constants.ZERO);
model.setHkStatus(Constants.ZERO);
model.setAuthStatus(Constants.ZERO);
model.setRemark("");
@@ -268,7 +269,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 +277,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 +356,26 @@
@Override
public List<Cars> findList(Cars cars) {
+ if(Objects.nonNull(cars)
+ && Constants.equalsInteger(Constants.ZERO,cars.getType())){
+ return this.getGwCar();
+ }
+ cars.setType(null);
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) {
@@ -367,6 +384,7 @@
queryWrapper.selectAll(Cars.class);
queryWrapper.selectAs(Member::getType,Cars::getMemberType);
queryWrapper.selectAs(Member::getName,Cars::getMemberName);
+ queryWrapper.selectAs(Member::getIsdeleted,Cars::getMemberDeleted);
queryWrapper.selectAs(SystemUser::getRealname,Cars::getEditorName);
queryWrapper.selectAs(Member::getPhone,Cars::getMemberPhone);
queryWrapper.selectAs(Member::getSex,Cars::getMemberSex);
@@ -423,6 +441,9 @@
cars.setGroupCateName(StringUtils.defaultString(cars.getCatePName(),"") + "/" + StringUtils.defaultString(cars.getCateName(),""));
}
cars.setParkBookList(getParkbookListByCode(cars,parkBooks));
+ if(Constants.equalsInteger(cars.getMemberDeleted(),Constants.ONE)){
+ cars.setMemberId(null);
+ }
}
}
return PageData.from(result);
@@ -460,6 +481,7 @@
.leftJoin(Parks.class,Parks::getId,ParkBook::getParkId);
wrapper.selectAs(ParkBook::getCarCode,CarsDTO::getCode)
.selectAs(ParkBook::getParkId,CarsDTO::getParkId)
+ .selectAs(Member::getIsdeleted,CarsDTO::getMemberDeleted)
.selectAs(ParkBook::getRemark,CarsDTO::getRemark)
.selectAs(Parks::getName,CarsDTO::getParkName)
.selectAs(ParkBook::getMemberId,CarsDTO::getMemberId)
@@ -472,7 +494,13 @@
.selectAs(ParkBook::getCreateDate,CarsDTO::getCreateDate);
wrapper.orderByDesc(ParkBook::getCreateDate);
IPage<CarsDTO> carsDTOIPage = parkBookJoinMapper.selectJoinPage(page, CarsDTO.class, wrapper);
-
+ if(carsDTOIPage!=null && carsDTOIPage.getRecords()!=null && carsDTOIPage.getRecords().size()>0){
+ for(CarsDTO cars :carsDTOIPage.getRecords()){
+ if(Constants.equalsInteger(cars.getMemberDeleted(),Constants.ONE)){
+ cars.setMemberId(null);
+ }
+ }
+ }
return PageData.from(carsDTOIPage);
}
@@ -483,7 +511,7 @@
if(importing!=null && importing){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝宸插瓨鍦ㄨ溅杈嗗鍏ヤ换鍔℃鍦ㄦ墽琛屼腑锛岃绋嶅悗鍐嶈瘯锛�");
}
- redisTemplate.opsForValue().set(Constants.RedisKeys.IMPORTING_CARS,true);
+ redisTemplate.opsForValue().set(Constants.RedisKeys.IMPORTING_CARS,true,30, TimeUnit.MINUTES);
try {
ExcelImporter ie = null;
List<CarsImport> dataList =null;
@@ -521,7 +549,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())
@@ -566,7 +594,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)+"琛岃溅杈嗕俊鎭笉瀹屾暣锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
@@ -594,14 +622,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