From a1e79f134dba2932d1038d8d0c133e97ca5b1e6c Mon Sep 17 00:00:00 2001 From: Vayne Date: Thu, 6 Apr 2023 19:24:54 +0800 Subject: [PATCH] =?UTF-8?q?SQL=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/invoices/InvoicesMapper.xml | 8 +- .../mapper/poundlist/PoundlistMapper.xml | 92 +++++++++---------- .../purchaseback/PurchasebackMapper.xml | 8 +- .../purchaseorder/PurchaseorderMapper.xml | 6 +- .../receiptin/Receiptin_item0Mapper.xml | 8 +- 5 files changed, 61 insertions(+), 61 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml index 02ea8639..8679c074 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml @@ -4,10 +4,10 @@ SELECT a.*,b.ticketno vehicleName,c.supplier_name supplierName,d.supplier_nm customerName,e.item_name materialName,f.contract_name salesName,g.contract_name purchaseName,h.F_RealName businessName,i.name naturalName,g.contract_no purchaseContractNo,f.contract_no salesContractNo,j.rate rate,j.amount amount,j.not_amount notAmount,k.document_no purchaseorderNo,c.bank colectionBank,c.bank_account collectionAccount from jg_poundlist a - LEFT JOIN jg_vehicle b on a.vehicle_id = b.id - LEFT JOIN jg_supplier c on a.supplier_id = c.id - LEFT JOIN jg_customer d on a.customer_id = d.id - LEFT JOIN jg_material e on a.material_id = e.id - LEFT JOIN jg_contract f on a.sales_id = f.id - LEFT JOIN jg_contract g on a.purchase_id = g.id + LEFT JOIN jg_vehicle b on a.vehicle_id = b.id and b.delete_mark = 0 + LEFT JOIN jg_supplier c on a.supplier_id = c.id and c.delete_mark = 0 + LEFT JOIN jg_customer d on a.customer_id = d.id and d.delete_mark = 0 + LEFT JOIN jg_material e on a.material_id = e.id and e.delete_mark = 0 + LEFT JOIN jg_contract f on a.sales_id = f.id and f.delete_mark = 0 + LEFT JOIN jg_contract g on a.purchase_id = g.id and g.delete_mark = 0 LEFT JOIN base_user h on a.business_id = h.f_id - LEFT JOIN jg_natural i on a.natural_id = i.id - LEFT JOIN jg_purchaseorder_item0 j on a.id = j.poundlist_id - LEFT JOIN jg_purchaseorder k on k.id = j.purchaseorder_id - where a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0 and e.delete_mark = 0 and f.delete_mark = 0 and g.delete_mark = 0 and a.id = #{id} + LEFT JOIN jg_natural i on a.natural_id = i.id and i.delete_mark = 0 + LEFT JOIN jg_purchaseorder_item0 j on a.id = j.poundlist_id and j.delete_mark = 0 + LEFT JOIN jg_purchaseorder k on k.id = j.purchaseorder_id and k.delete_mark = 0 + where a.delete_mark = 0 and a.id = #{id} SELECT a.*,b.ticketno vehicleName,c.supplier_name supplierName,d.supplier_nm customerName,e.item_name materialName,f.contract_name salesName,g.contract_name purchaseName,h.F_RealName businessName,i.name naturalName,g.contract_no purchaseContractNo,f.contract_no salesContractNo,j.rate rate,j.amount amount,j.not_amount notAmount,k.document_no purchaseorderNo,c.bank colectionBank,c.bank_account collectionAccount from jg_poundlist a - LEFT JOIN jg_vehicle b on a.vehicle_id = b.id - LEFT JOIN jg_supplier c on a.supplier_id = c.id - LEFT JOIN jg_customer d on a.customer_id = d.id - LEFT JOIN jg_material e on a.material_id = e.id - LEFT JOIN jg_contract f on a.sales_id = f.id - LEFT JOIN jg_contract g on a.purchase_id = g.id + LEFT JOIN jg_vehicle b on a.vehicle_id = b.id and b.delete_mark = 0 + LEFT JOIN jg_supplier c on a.supplier_id = c.id and c.delete_mark = 0 + LEFT JOIN jg_customer d on a.customer_id = d.id and d.delete_mark = 0 + LEFT JOIN jg_material e on a.material_id = e.id and e.delete_mark = 0 + LEFT JOIN jg_contract f on a.sales_id = f.id and f.delete_mark = 0 + LEFT JOIN jg_contract g on a.purchase_id = g.id and g.delete_mark = 0 LEFT JOIN base_user h on a.business_id = h.f_id - LEFT JOIN jg_natural i on a.natural_id = i.id - LEFT JOIN jg_purchaseorder_item0 j on a.id = j.poundlist_id - LEFT JOIN jg_purchaseorder k on k.id = j.purchaseorder_id - LEFT JOIN jg_paymentdoc_item1 l on (a.id = l.poundlist_id and k.id = l.purchaseorder_id and l.paymentdoc_id = #{paymentdocId}) - where a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0 and e.delete_mark = 0 and f.delete_mark = 0 and g.delete_mark = 0 and a.id in + LEFT JOIN jg_natural i on a.natural_id = i.id and i.delete_mark = 0 + LEFT JOIN jg_purchaseorder_item0 j on a.id = j.poundlist_id and j.delete_mark = 0 + LEFT JOIN jg_purchaseorder k on k.id = j.purchaseorder_id and k.delete_mark = 0 + LEFT JOIN jg_paymentdoc_item1 l on (a.id = l.poundlist_id and k.id = l.purchaseorder_id and l.paymentdoc_id = #{paymentdocId}) and l.delete_mark = 0 + where a.delete_mark = 0 and a.id in #{item} diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml index 8def19d9..d8626837 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml @@ -4,10 +4,10 @@ SELECT a.*,b.supplier_name supplierName,c.contract_name contractName from jg_purchaseorder a - LEFT JOIN jg_supplier b on a.supplier_id = b.id - LEFT JOIN jg_contract c on a.contract_code = c.id - ${ew.customSqlSegment} and a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 + LEFT JOIN jg_supplier b on a.supplier_id = b.id and b.delete_mark = 0 + LEFT JOIN jg_contract c on a.contract_code = c.id and c.delete_mark = 0 + ${ew.customSqlSegment} and a.delete_mark = 0 AND (c.contract_name LIKE CONCAT('%',#{purchaseorderPagination.keyword},'%') OR b.supplier_name LIKE CONCAT('%',#{purchaseorderPagination.keyword},'%')) diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/Receiptin_item0Mapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/Receiptin_item0Mapper.xml index ff01e338..65ac58da 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/Receiptin_item0Mapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/Receiptin_item0Mapper.xml @@ -4,10 +4,10 @@