From ab890bca34582e2ec8e2d4b19798f067ea075b7a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 28 四月 2025 10:30:47 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 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..5fed85e 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
@@ -72,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){
             //妫�鏌ヨ溅涓讳俊鎭�
@@ -268,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
@@ -276,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(),"瀵逛笉璧凤紝杞﹁締淇℃伅涓嶅瓨鍦紒");
@@ -367,6 +367,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 +424,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 +464,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 +477,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);
     }
 
@@ -521,7 +532,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 +577,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 +605,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