From e067f714c0588407b1c20ddd6b7af3b2043e35f8 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 29 九月 2025 11:29:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 5fed85e..50ff9f0 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
@@ -108,9 +108,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("");
@@ -355,11 +355,26 @@
@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) {
IPage<Cars> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
--
Gitblit v1.9.3