From cd10f2eb9a51da261329c64574a5d5c64ae29d78 Mon Sep 17 00:00:00 2001 From: kchh <365619549@qq.com> Date: Fri, 10 Nov 2023 10:16:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84=E6=9D=BF=E8=BD=A6=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../haitongauto/mapper/admin/AnnouncementAdminMapper.java | 2 -- .../java/com/haitongauto/mapper/base/AppointmentMapper.java | 1 - models/pom.xml | 2 -- .../com/haitongauto/rtosac/api/AppointmentController.java | 6 +++--- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/mapper/src/main/java/com/haitongauto/mapper/admin/AnnouncementAdminMapper.java b/mapper/src/main/java/com/haitongauto/mapper/admin/AnnouncementAdminMapper.java index ab2f685..69176cc 100644 --- a/mapper/src/main/java/com/haitongauto/mapper/admin/AnnouncementAdminMapper.java +++ b/mapper/src/main/java/com/haitongauto/mapper/admin/AnnouncementAdminMapper.java @@ -3,8 +3,6 @@ package com.haitongauto.mapper.admin; import com.haitongauto.models.pojo.Announcement; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; - -import java.time.LocalDate; import java.util.Date; import java.util.List; diff --git a/mapper/src/main/java/com/haitongauto/mapper/base/AppointmentMapper.java b/mapper/src/main/java/com/haitongauto/mapper/base/AppointmentMapper.java index b3dca65..d01638f 100644 --- a/mapper/src/main/java/com/haitongauto/mapper/base/AppointmentMapper.java +++ b/mapper/src/main/java/com/haitongauto/mapper/base/AppointmentMapper.java @@ -1,5 +1,4 @@ package com.haitongauto.mapper.base; - import com.haitongauto.models.pojo.Appointment; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/models/pom.xml b/models/pom.xml index 5efb0f9..bc480c0 100644 --- a/models/pom.xml +++ b/models/pom.xml @@ -8,9 +8,7 @@ 1.0-SNAPSHOT 4.0.0 - models - 1.8 1.8 diff --git a/wx-applet/src/main/java/com/haitongauto/rtosac/api/AppointmentController.java b/wx-applet/src/main/java/com/haitongauto/rtosac/api/AppointmentController.java index 6f6cae2..a1f2120 100644 --- a/wx-applet/src/main/java/com/haitongauto/rtosac/api/AppointmentController.java +++ b/wx-applet/src/main/java/com/haitongauto/rtosac/api/AppointmentController.java @@ -281,7 +281,7 @@ public class AppointmentController { //内贸出口的品牌不能为空(商品车) if ("NE".equals(enter_type) && "C".equals(goods_type)) { - List vinss = Linq.of(appointmentDetailList).where(p -> p.getBrand_id() != null && !p.getBrand_id().isEmpty()).select(AppointmentDetail::getBrand_id).distinct().toList(); + List vinss = Linq.of(appointmentDetailList).where(p -> p.getBrand_id() == null || p.getBrand_id().isEmpty()).select(AppointmentDetail::getVin).distinct().toList(); if (vinss != null && vinss.size() > 0) { String myVins = String.join(",", vinss); msg = "内贸出口，vin:" + myVins + "预约明细的品牌不能为空。"; @@ -551,9 +551,9 @@ public class AppointmentController { return response.getResponseData(bl, data, msg); } - //内贸出口的品牌不能为空 + //内贸出口的品牌不能为空(商品车) if ("NE".equals(enter_type) && "C".equals(goods_type)) { - List vinss = Linq.of(appointmentDetailList).where(p -> p.getBrand_id() != null && !p.getBrand_id().isEmpty()).select(AppointmentDetail::getBrand_id).distinct().toList(); + List vinss = Linq.of(appointmentDetailList).where(p -> p.getBrand_id() == null || p.getBrand_id().isEmpty()).select(AppointmentDetail::getVin).distinct().toList(); if (vinss != null && vinss.size() > 0) { String myVins = String.join(",", vinss); msg = "内贸出口，vin:" + myVins + "预约明细的品牌不能为空。";