From 55066f2f389052483f8f4d702744573d2b9f0394 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 26 Mar 2024 10:57:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=BD=A6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buscenter/biz/bussalesorder/BusSalesOrderService.java | 3 ++- .../biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java | 3 +++ .../biz/bussalesordervehicle/BusSalesOrderVehicleService.java | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 8ea6546185..b43d5f655d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -2069,10 +2069,11 @@ public class BusSalesOrderService extends MybatisBaseService vinSids = busSalesOrderVehicleService.selectBySalesOrderSid(record.getSaleOrderSid()); + List vinSids2 = busSalesOrderVehicleService.selectBySalesOrderSid2(record.getSaleOrderSid()); vinSids.removeAll(Collections.singleton(null)); if (vinSids.size() > 0) { int i = busHandoverService.selectByCount(record.getContractId(), vinSids); - if (record.isShowStopBtn() && i < vinSids.size()) { + if (record.isShowStopBtn() && i < vinSids2.size()) { record.setShowStopBtn(true); } else { record.setShowStopBtn(false); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java index 555d27244e..2250c5e3fc 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java @@ -178,4 +178,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper selectBySalesOrderSid2(String saleOrderSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 84d7fa3674..0f981efb49 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -659,4 +659,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService selectBySalesOrderSid2(String saleOrderSid) { + return baseMapper.selectBySalesOrderSid2(saleOrderSid); + } } \ No newline at end of file