dengjun
/
customer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

退关导入问题

This commit is contained in:
dengjun 2024-01-02 15:03:04 +08:00
parent 1dfb2a1279
commit e1091ee4ea
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nuzar-customer-client/src/main/java/com/haitonggauto/rtosc/query/CargoQuery.java
View File

@ -1,5 +1,7 @@
package com.haitonggauto.rtosc.query;
import com.haitonggauto.rtosc.common.db.anno.DbQuery;
import com.haitonggauto.rtosc.common.db.enums.SqlSymbol;
import com.haitonggauto.rtosc.common.db.query.BaseQuery;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -14,4 +16,7 @@ public class CargoQuery extends BaseQuery {
@ApiModelProperty(value = "车架号")
private String vin;
@ApiModelProperty(value = "品牌ID")
private String brandId;
}

1
nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/ExportInHandler.java
View File

@ -460,6 +460,7 @@ public class ExportInHandler implements BaseHandler {
queryWrapper.eq(query.getId() != null, CustomerExportInCargo::getExportInId, query.getId());
queryWrapper.like(StringUtils.isNotEmpty(query.getVin()), CustomerExportInCargo::getVin, query.getVin());
queryWrapper.in(CollectionUtils.isNotEmpty(query.getIds()), CustomerExportInCargo::getExportInId, query.getIds());
queryWrapper.exists(StringUtils.isNotEmpty(query.getBrandId()), "select id from customer_export_in where customer_export_in.id=customer_export_in_cargo.export_in_id and customer_export_in.brand_id={0}", query.getBrandId());
if (query.getCargoType() != null) {
queryWrapper.eq(CustomerExportInCargo::getCargoType, query.getCargoType());
}

4
nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/ExportLoadHandler.java
View File

@ -1061,11 +1061,11 @@ public class ExportLoadHandler implements BaseHandler {
return v;
}).collect(Collectors.toList());
List<CheckVinReq> rst = shpApi.checkVinRepeat(req);
existVins.clear();
if (CollectionUtils.isNotEmpty(rst)) {
// 再次过滤出重复的
List<CheckVinReq> sCollect = rst.stream().filter(ss -> ss.getIsRepetition()).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(sCollect)) {
existVins.clear();
existVins.addAll(sCollect.stream().map(ss -> ss.getVinCode()).collect(Collectors.toList()));
}
}
@ -1514,11 +1514,11 @@ public class ExportLoadHandler implements BaseHandler {
return v;
}).collect(Collectors.toList());
List<CheckVinReq> rst = shpApi.checkVinRepeat(req);
existVins.clear();
if (CollectionUtils.isNotEmpty(rst)) {
// 再次过滤出重复的
List<CheckVinReq> sCollect = rst.stream().filter(ss -> ss.getIsRepetition()).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(sCollect)) {
existVins.clear();
existVins.addAll(sCollect.stream().map(ss -> ss.getVinCode()).collect(Collectors.toList()));
}
}