From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarDriverServiceImpl.java | 64 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 13 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarDriverServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarDriverServiceImpl.java
index b8558f1..4903925 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarDriverServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarDriverServiceImpl.java
@@ -2,16 +2,14 @@
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.Utils;
import com.doumee.dao.business.CarDriverMapper;
-import com.doumee.dao.business.MemberMapper;
-import com.doumee.dao.business.model.CarDriver;
-import com.doumee.dao.business.model.CarUseBook;
-import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.dao.MemberMapper;
+import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.CarDriverService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -19,13 +17,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import lombok.extern.java.Log;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import javax.smartcardio.Card;
import java.util.Date;
import java.util.List;
@@ -59,12 +56,18 @@
.eq(CarDriver::getIsdeleted, Constants.ZERO))>0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇ュ徃鏈哄凡缁忛厤缃紝鏃犻渶閲嶆柊閰嶇疆锛�");
}
+ if(carDriver.getCarId()!=null && carDriverMapper.selectCount(new QueryWrapper<CarDriver>().lambda()
+ .eq(CarDriver::getCarId,carDriver.getCarId())
+ .eq(CarDriver::getIsdeleted, Constants.ZERO))>0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇ヨ溅杈嗗凡缁忛厤缃紝鏃犻渶閲嶆柊閰嶇疆锛�");
+ }
carDriver.setCreateDate(new Date());
carDriver.setCreator(loginUserInfo.getId());
carDriver.setEditDate(new Date());
carDriver.setEdirot(loginUserInfo.getId());
carDriver.setCompanyId(member.getCompanyId());
carDriver.setStatus(Constants.ZERO);
+ carDriver.setIsdeleted(Constants.ZERO);
carDriverMapper.insert(carDriver);
return carDriver.getId();
}
@@ -94,9 +97,36 @@
if(loginUserInfo == null){
loginUserInfo = carDriver.getLoginUserInfo();
}
+ if(carDriverMapper.selectById(carDriver.getId()) == null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY );
+ }
+ Member member = memberMapper.selectById(carDriver.getMemberId());
+ if(member == null
+ ||Constants.equalsInteger(member.getIsdeleted(),Constants.ONE)
+ ||!Constants.equalsInteger(member.getType(),Constants.TWO)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇ュ徃鏈轰俊鎭笉瀛樺湪锛岃杩斿洖鍒锋柊椤甸潰閲嶈瘯锛�");
+ }
+ if(carDriverMapper.selectCount(new QueryWrapper<CarDriver>().lambda()
+ .eq(CarDriver::getMemberId,carDriver.getMemberId())
+ .ne(CarDriver::getId,carDriver.getId())
+ .eq(CarDriver::getIsdeleted, Constants.ZERO))>0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇ュ徃鏈哄凡缁忛厤缃紝鏃犻渶閲嶆柊閰嶇疆锛�");
+ }
+ if(carDriver.getCarId()!=null && carDriverMapper.selectCount(new QueryWrapper<CarDriver>().lambda()
+ .eq(CarDriver::getCarId,carDriver.getCarId())
+ .ne(CarDriver::getId,carDriver.getId())
+ .eq(CarDriver::getIsdeleted, Constants.ZERO))>0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇ヨ溅杈嗗凡缁忛厤缃紝鏃犻渶閲嶆柊閰嶇疆锛�");
+ }
carDriver.setEditDate(new Date());
carDriver.setEdirot(loginUserInfo.getId());
- carDriverMapper.updateById(carDriver);
+ carDriverMapper.update(null,new UpdateWrapper<CarDriver>().lambda()
+ .eq(CarDriver::getId,carDriver.getId())
+ .set(CarDriver::getMemberId,carDriver.getMemberId())
+ .set(CarDriver::getCarId,carDriver.getCarId())
+ .set(CarDriver::getEdirot,carDriver.getEdirot())
+ .set(CarDriver::getEditDate,carDriver.getEditDate())
+ );
}
@Override
@@ -114,9 +144,12 @@
MPJLambdaWrapper<CarDriver> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(CarDriver.class);
queryWrapper.selectAs(Member::getName,CarDriver::getMemberName);
+ queryWrapper.selectAs(Member::getSex,CarDriver::getMemberSex);
queryWrapper.selectAs(Member::getPhone,CarDriver::getMemberPhone);
+ queryWrapper.selectAs(Cars::getCode,CarDriver::getCarCode);
queryWrapper.selectAs(Company::getCompanyNamePath,CarDriver::getCompanyName);
- queryWrapper.leftJoin(Member.class,Member::getId,CarUseBook::getMemberId)
+ queryWrapper.leftJoin(Member.class,Member::getId,CarDriver::getMemberId)
+ .leftJoin(Cars.class,Cars::getId,CarDriver::getCarId)
.leftJoin(Company.class,Company::getId,Member::getCompanyId)
.eq(CarDriver::getId,id)
.last("limit 1");
@@ -141,10 +174,13 @@
MPJLambdaWrapper<CarDriver> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.selectAll(CarDriver.class);
+ queryWrapper.selectAs(Cars::getCode,CarDriver::getCarCode);
queryWrapper.selectAs(Member::getName,CarDriver::getMemberName);
+ queryWrapper.selectAs(Member::getSex,CarDriver::getMemberSex);
queryWrapper.selectAs(Member::getPhone,CarDriver::getMemberPhone);
queryWrapper.selectAs(Company::getCompanyNamePath,CarDriver::getCompanyName);
- queryWrapper.leftJoin(Member.class,Member::getId,CarUseBook::getMemberId)
+ queryWrapper.leftJoin(Member.class,Member::getId,CarDriver::getMemberId)
+ .leftJoin(Cars.class,Cars::getId,CarDriver::getCarId)
.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper
.eq(pageWrap.getModel().getId() != null, CarDriver::getId, pageWrap.getModel().getId())
@@ -154,12 +190,14 @@
.eq(pageWrap.getModel().getEdirot() != null, CarDriver::getEdirot, pageWrap.getModel().getEdirot())
.ge(pageWrap.getModel().getEditDate() != null, CarDriver::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()))
.le(pageWrap.getModel().getEditDate() != null, CarDriver::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()))
- .eq(pageWrap.getModel().getIsdeleted() != null, CarDriver::getIsdeleted, pageWrap.getModel().getIsdeleted())
+ .eq( CarDriver::getIsdeleted, Constants.ZERO)
.eq(pageWrap.getModel().getRemark() != null, CarDriver::getRemark, pageWrap.getModel().getRemark())
.eq(pageWrap.getModel().getSortnum() != null, CarDriver::getSortnum, pageWrap.getModel().getSortnum())
.eq(pageWrap.getModel().getCompanyId() != null, CarDriver::getCompanyId, pageWrap.getModel().getCompanyId())
.eq(pageWrap.getModel().getStatus() != null, CarDriver::getStatus, pageWrap.getModel().getStatus())
.eq(pageWrap.getModel().getMemberId() != null, CarDriver::getMemberId, pageWrap.getModel().getMemberId())
+ .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
+ .or().like(Member::getPhone,pageWrap.getModel().getMemberName()))
.orderByDesc(CarDriver::getCreateDate );
;
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
--
Gitblit v1.9.3