wsnet
/
mini-service-v4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新了对外接口的板车监控

main
kchh 2023-11-10 10:16:50 +08:00
parent c3f0275dce
commit cd10f2eb9a
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mapper/src/main/java/com/haitongauto/mapper/admin/AnnouncementAdminMapper.java
View File

@ -3,8 +3,6 @@ package com.haitongauto.mapper.admin;
import com.haitongauto.models.pojo.Announcement; import com.haitongauto.models.pojo.Announcement;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.time.LocalDate;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;

1
mapper/src/main/java/com/haitongauto/mapper/base/AppointmentMapper.java
View File

@ -1,5 +1,4 @@
package com.haitongauto.mapper.base; package com.haitongauto.mapper.base;
import com.haitongauto.models.pojo.Appointment; import com.haitongauto.models.pojo.Appointment;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

2
models/pom.xml
View File

@ -8,9 +8,7 @@
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>models</artifactId> <artifactId>models</artifactId>
<properties> <properties>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>

6
wx-applet/src/main/java/com/haitongauto/rtosac/api/AppointmentController.java
View File

@ -281,7 +281,7 @@ public class AppointmentController {
//内贸出口的品牌不能为空(商品车) //内贸出口的品牌不能为空(商品车)
if ("NE".equals(enter_type) && "C".equals(goods_type)) { if ("NE".equals(enter_type) && "C".equals(goods_type)) {
List<String> vinss = Linq.of(appointmentDetailList).where(p -> p.getBrand_id() != null && !p.getBrand_id().isEmpty()).select(AppointmentDetail::getBrand_id).distinct().toList(); List<String> 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) { if (vinss != null && vinss.size() > 0) {
String myVins = String.join(",", vinss); String myVins = String.join(",", vinss);
msg = "内贸出口，vin:" + myVins + "预约明细的品牌不能为空。"; msg = "内贸出口，vin:" + myVins + "预约明细的品牌不能为空。";
@ -551,9 +551,9 @@ public class AppointmentController {
return response.getResponseData(bl, data, msg); return response.getResponseData(bl, data, msg);
} }
//内贸出口的品牌不能为空 //内贸出口的品牌不能为空(商品车)
if ("NE".equals(enter_type) && "C".equals(goods_type)) { if ("NE".equals(enter_type) && "C".equals(goods_type)) {
List<String> vinss = Linq.of(appointmentDetailList).where(p -> p.getBrand_id() != null && !p.getBrand_id().isEmpty()).select(AppointmentDetail::getBrand_id).distinct().toList(); List<String> 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) { if (vinss != null && vinss.size() > 0) {
String myVins = String.join(",", vinss); String myVins = String.join(",", vinss);
msg = "内贸出口，vin:" + myVins + "预约明细的品牌不能为空。"; msg = "内贸出口，vin:" + myVins + "预约明细的品牌不能为空。";