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 |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 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..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瀹炵幇
@@ -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("");
@@ -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) {
@@ -494,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;

--
Gitblit v1.9.3