From 5e5a317f936e4e333809298930fb771fc0bdc9ac Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 12 九月 2025 16:32:34 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 98 +++++++++++++++++++++++++++++++++----------------
1 files changed, 66 insertions(+), 32 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 a08b6e5..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
@@ -1,7 +1,5 @@
package com.doumee.service.business.impl;
-import cn.hutool.core.util.IdcardUtil;
-import cn.hutool.core.util.PhoneUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,22 +7,21 @@
import com.doumee.core.annotation.excel.ExcelImporter;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.ScientificNotationTUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.CarsImport;
import com.doumee.dao.admin.request.CarsQuery;
-import com.doumee.dao.admin.request.MemberImport;
import com.doumee.dao.admin.response.CarsDTO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.CarJoinMapper;
-import com.doumee.dao.business.join.ParkBookJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.CarsService;
import com.doumee.service.business.impl.hksync.HkSyncParkServiceImpl;
@@ -75,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){
//妫�鏌ヨ溅涓讳俊鎭�
@@ -134,24 +131,25 @@
}
Date date = new Date();
//鍒犻櫎宸叉巿鏉冧笅鍙戠殑鍖呮湡鎺堟潈
- dealCancelBookBiz(car.getCode(),date);
- Cars model = new Cars();
- model.setEditDate(date);
- model.setEdirot(user.getId());
- model.setId(id);
- model.setIsdeleted(Constants.ONE);
+ dealCancelBookBiz(car.getCode(),date,parkBookJoinMapper);
+// Cars model = new Cars();
+// model.setEditDate(date);
+// model.setEdirot(user.getId());
+// model.setId(id);
+// model.setIsdeleted(Constants.ONE);
carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
- .eq(Cars::getId,model.getId())
+ .eq(Cars::getId,id)
.set(Cars::getStartTime,null)
.set(Cars::getEndTime,null)
+ .set(Cars::getAuthTimeType,null)
.set(Cars::getAuthStatus,Constants.ZERO)
.set(Cars::getIsdeleted,Constants.ONE)
- .set(Cars::getEditDate,model.getEditDate())
- .set(Cars::getEdirot,model.getEdirot())
+ .set(Cars::getEditDate,date)
+ .set(Cars::getEdirot,user.getId())
);
- carsMapper.updateById(model);
+// carsMapper.updateById(model);
}
- public boolean dealCancelBookBiz(String code,Date date){
+ public static boolean dealCancelBookBiz(String code,Date date,ParkBookMapper parkBookJoinMapper){
List<ParkBook> parkBooks = parkBookJoinMapper.selectJoinList(ParkBook.class,new MPJLambdaWrapper<ParkBook>()
.selectAll(ParkBook.class )
@@ -270,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
@@ -278,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(),"瀵逛笉璧凤紝杞﹁締淇℃伅涓嶅瓨鍦紒");
@@ -313,7 +311,7 @@
model.setHkStatus(Constants.ZERO);
model.setRemark("");
model.setAuthStatus(Constants.ZERO);
- dealCancelBookBiz(car.getCode(),model.getEditDate());
+ dealCancelBookBiz(car.getCode(),model.getEditDate(),parkBookJoinMapper);
carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
.eq(Cars::getId,model.getId())
.set(Cars::getAuthStatus,Constants.ZERO)
@@ -324,6 +322,7 @@
.set(Cars::getEditDate,model.getEditDate())
.set(Cars::getEdirot,model.getEdirot())
.set(Cars::getMemberId,model.getMemberId())
+ .set(Cars::getAuthTimeType,null)
.set(Cars::getStartTime,null)
.set(Cars::getEndTime,null)
);
@@ -356,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) {
@@ -368,8 +382,11 @@
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);
+ queryWrapper.selectAs(Member::getIdcardDecode,Cars::getMemberCard);
queryWrapper.selectAs(Company::getCompanyNamePath,Cars::getCompanyName);
queryWrapper.selectAs(Category::getParentId,Cars::getCatePId);
queryWrapper.selectAs(Category::getName,Cars::getCateName);
@@ -386,6 +403,7 @@
.or().like(Member::getPhone,pageWrap.getModel().getMemberName()));
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getCompanyNamePath,pageWrap.getModel().getCompanyName());
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getMemberType()),Member::getType,pageWrap.getModel().getMemberType());
+ queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getCateId()),Category::getId,pageWrap.getModel().getCateId());
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getCatePId()),Category::getParentId,pageWrap.getModel().getCatePId());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCode()),Cars::getCode,pageWrap.getModel().getCode());
queryWrapper.eq(Cars::getIsdeleted,Constants.ZERO);
@@ -417,22 +435,31 @@
.in(ParkBook::getCarCode,codes)
.eq(ParkBook::getIsdeleted,Constants.ZERO) );
for(Cars cars :result.getRecords()){
- cars.setParkBookList(getParkbookListByCode(cars.getCode(),parkBooks));
+ if(StringUtils.isNotBlank(cars.getCateName())){
+ 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);
}
- private List<ParkBook> getParkbookListByCode(String code, List<ParkBook> parkBooks) {
+ private List<ParkBook> getParkbookListByCode(Cars car, List<ParkBook> parkBooks) {
List<ParkBook> list =null;
+ String name = "";
for(ParkBook p : parkBooks){
- if(StringUtils.equals(p.getCarCode(),code)){
+ if(StringUtils.equals(p.getCarCode(),car.getCode())){
if(list == null){
list = new ArrayList<>();
}
+ name += p.getParksName();
list.add(p);
}
}
+ car.setParksName(name);
return list;
}
@@ -452,6 +479,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)
@@ -464,7 +492,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);
}
@@ -513,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())
@@ -558,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)+"琛岃溅杈嗕俊鎭笉瀹屾暣锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
@@ -586,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