From 6d6e2c77e34e7dbae4fba340c423eaafc2b9c231 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 16 四月 2024 16:46:28 +0800
Subject: [PATCH] 后端导出excel文件

---
 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml |  507 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 495 insertions(+), 12 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml
index 795ec35..2e92abc 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml
@@ -29,6 +29,7 @@
 
         <result column="d_quantity" property="deliveryDetail.quantity"/>
         <result column="money" property="deliveryDetail.money"/>
+        <result column="delivery_number" property="deliveryDetail.deliveryNumber"/>
         <result column="delivery_detail_remakes" property="deliveryDetail.deliveryDetailRemakes"/>
 
         <result column="batch" property="order.batch"/>
@@ -55,12 +56,55 @@
 
     </resultMap>
 
+    <resultMap id="selectDeliveryDetail" type="com.example.erp.entity.sd.DeliveryDetail">
+
+        <result column="order_id" property="orderId"/>
+        <result column="order_number" property="orderNumber"/>
+        <result column="o_quantity" property="quantity"/>
+        <result column="delivery_id" property="deliveryId"/>
+        <result column="delivery_number" property="deliveryNumber"/>
+        <result column="quantity" property="quantity"/>
+        <result column="area" property="area"/>
+        <result column="money" property="money"/>
+        <result column="delivery_detail_remakes" property="deliveryDetailRemakes"/>
+        <result column="delivery_detail_state" property="deliveryDetailState"/>
+        <result column="create_time" property="createTime"/>
+
+        <result column="customer_id" property="delivery.customerId"/>
+        <result column="customer_name" property="delivery.customerName"/>
+        <result column="project" property="delivery.project"/>
+        <result column="pay_method" property="delivery.payMethod"/>
+        <result column="payment_terms" property="delivery.paymentTerms"/>
+        <result column="pay_date" property="delivery.payDate"/>
+        <result column="contacts" property="delivery.contacts"/>
+        <result column="contact_number" property="delivery.contactNumber"/>
+        <result column="delivery_address" property="delivery.deliveryAddress"/>
+        <result column="delivery_date" property="delivery.deliveryDate"/>
+        <result column="creator" property="delivery.creator"/>
+        <result column="salesman" property="delivery.salesman"/>
+
+
+
+    </resultMap>
+
+    <delete id="deleteDeliveryDetail">
+        delete from sd.delivery_detail where delivery_id=#{deliveryId}
+    </delete>
+
     <update id="updateOrderDetailDeliveryNum">
-        update sd.order_detail set delivery_num=#{finishedGoodsInventory.quantityAvailable} where order_id=#{orderId} and order_number=#{orderNumber}
+        update sd.order_detail set delivery_num=delivery_num+#{deliveryDetail.quantity} where order_id=#{orderId} and order_number=#{orderNumber}
+    </update>
+
+    <update id="updateIsNotOrderDetailDeliveryNum">
+        update sd.order_detail set delivery_num=delivery_num-#{quantity} where order_id=#{orderId} and order_number=#{orderNumber}
     </update>
 
     <select id="getdeliveryDetailmaximum" >
         select count(*) from sd.delivery_detail where  delivery_id=#{deliveryId}
+    </select>
+
+    <select id="getIsNotDeliveryDetail" >
+        select * from sd.delivery_detail where  delivery_id=#{deliveryId}
     </select>
 
 
@@ -69,18 +113,39 @@
                                         area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,create_time)
         values (
                    #{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeGrossArea},
-                #{orderDetail.orderId},#{orderDetail.finishedGoodsInventory.quantityAvailable},
-                #{orderDetail.price}*#{orderDetail.finishedGoodsInventory.quantityAvailable},'',1,now()
+                #{orderDetail.orderId},#{orderDetail.deliveryDetail.quantity},
+                #{orderDetail.price}*#{orderDetail.deliveryDetail.quantity},'',1,now()
                )
     </insert>
 
 
 
-    <select id="getseletShippingOrderDetail" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
-        select od.order_id,o.batch,fgi.quantity_available,od.quantity-dd.quantity as t_quantity,od.quantity as o_quantity,dd.quantity
-        as d_quantity,od.building_number,od.product_id,od.product_name,od.price,fgi.storage_region,dd.money,od.width,
-        od.height,od.shape,fgi.actual_signal_area,od.gross_area,od.compute_area,od.compute_gross_area,
-        od.processing_note,od.edging_type,od.perimeter,dd.delivery_detail_remakes
+    <select id="getSelectShippingOrderDetail" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
+        select od.order_id,
+               o.batch,
+               dd.delivery_number,
+               fgi.quantity_available + dd.quantity as quantity_available,
+               od.order_number,
+               od.quantity-dd.quantity as t_quantity,
+               od.quantity as o_quantity,
+               dd.quantity as d_quantity,
+               od.building_number,
+               od.product_id,
+               od.product_name,
+               od.price,
+               fgi.storage_region,
+               dd.money,
+               od.width,
+               od.height,
+               od.shape,
+               fgi.actual_signal_area,
+               od.gross_area,
+               od.compute_area,
+               od.compute_gross_area,
+               od.processing_note,
+               od.edging_type,
+               od.perimeter,
+               dd.delivery_detail_remakes
         from sd.delivery_detail dd
         left join sd.delivery d on dd.delivery_id=d.delivery_id
         left join sd.order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
@@ -90,12 +155,79 @@
             <if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
                 and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
             </if>
+            <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
+                and od.order_id regexp #{orderDetail.orderId}
+            </if>
+            <if test="orderDetail.order.batch != null and orderDetail.order.batch != ''">
+                and o.batch regexp #{orderDetail.order.batch}
+            </if>
+            <if test="orderDetail.finishedGoodsInventory.quantityAvailable != null and orderDetail.finishedGoodsInventory.quantityAvailable != ''">
+                and fgi.quantity_available regexp #{orderDetail.finishedGoodsInventory.quantityAvailable}
+            </if>
+            <if test="orderDetail.quantity != null and orderDetail.quantity != ''">
+                and od.quantity regexp #{orderDetail.quantity}
+            </if>
+            <if test="orderDetail.deliveryDetail.quantity != null and orderDetail.deliveryDetail.quantity != ''">
+                and dd.quantity regexp #{orderDetail.deliveryDetail.quantity}
+            </if>
+            <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
+                and od.building_number regexp #{orderDetail.buildingNumber}
+            </if>
+            <if test="orderDetail.productId != null and orderDetail.productId != ''">
+                and od.product_id regexp #{orderDetail.productId}
+            </if>
+            <if test="orderDetail.productName != null and orderDetail.productName != ''">
+                and od.product_name regexp #{orderDetail.productName}
+            </if>
+            <if test="orderDetail.price != null and orderDetail.price != ''">
+                and od.price regexp #{orderDetail.price}
+            </if>
+            <if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
+                and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
+            </if>
+            <if test="orderDetail.deliveryDetail.money != null and orderDetail.deliveryDetail.money != ''">
+                and dd.money regexp  REGEXP_REPLACE(#{orderDetail.deliveryDetail.money},'\\.0+$','')
+            </if>
+            <if test="orderDetail.width != null and orderDetail.width != ''">
+                and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
+            </if>
+            <if test="orderDetail.height != null and orderDetail.height != ''">
+                and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
+            </if>
+            <if test="orderDetail.shape != null and orderDetail.shape != ''">
+                and od.shape regexp #{orderDetail.shape}
+            </if>
+            <if test="orderDetail.finishedGoodsInventory.actualSignalArea != null and orderDetail.finishedGoodsInventory.actualSignalArea != ''">
+                and fgi.actual_signal_area regexp REGEXP_REPLACE(#{orderDetail.finishedGoodsInventory.actualSignalArea},'\\.0+$','')
+            </if>
+            <if test="orderDetail.grossArea != null and orderDetail.grossArea != ''">
+                and od.gross_area regexp REGEXP_REPLACE(#{orderDetail.grossArea},'\\.0+$','')
+            </if>
+            <if test="orderDetail.computeArea != null and orderDetail.computeArea != ''">
+                and od.compute_area regexp REGEXP_REPLACE(#{orderDetail.computeArea},'\\.0+$','')
+            </if>
+            <if test="orderDetail.computeGrossArea != null and orderDetail.computeGrossArea != ''">
+                and od.compute_gross_area regexp REGEXP_REPLACE(#{orderDetail.computeGrossArea},'\\.0+$','')
+            </if>
+            <if test="orderDetail.processingNote != null and orderDetail.processingNote != ''">
+                and od.processing_note regexp #{orderDetail.processingNote}
+            </if>
+            <if test="orderDetail.edgingType != null and orderDetail.edgingType != ''">
+                and od.edging_type regexp #{orderDetail.edgingType}
+            </if>
+            <if test="orderDetail.perimeter != null and orderDetail.perimeter != ''">
+                and od.perimeter regexp #{orderDetail.perimeter}
+            </if>
+            <if test="orderDetail.deliveryDetail.deliveryDetailRemakes != null and orderDetail.deliveryDetail.deliveryDetailRemakes != ''">
+                and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}
+            </if>
 
         </where>
+        order by dd.id desc
         limit #{offset},#{pageSize};
     </select>
 
-    <select id="getseletShippingOrderDetailPageTotal">
+    <select id="getSelectShippingOrderDetailPageTotal">
         select
             CEILING(count(dd.id)/#{pageSize})
         from sd.delivery_detail dd
@@ -107,18 +239,84 @@
             <if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
                 and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
             </if>
+            <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
+                and od.order_id regexp #{orderDetail.orderId}
+            </if>
+            <if test="orderDetail.order.batch != null and orderDetail.order.batch != ''">
+                and o.batch regexp #{orderDetail.order.batch}
+            </if>
+            <if test="orderDetail.finishedGoodsInventory.quantityAvailable != null and orderDetail.finishedGoodsInventory.quantityAvailable != ''">
+                and fgi.quantity_available regexp #{orderDetail.finishedGoodsInventory.quantityAvailable}
+            </if>
+            <if test="orderDetail.quantity != null and orderDetail.quantity != ''">
+                and od.quantity regexp #{orderDetail.quantity}
+            </if>
+            <if test="orderDetail.deliveryDetail.quantity != null and orderDetail.deliveryDetail.quantity != ''">
+                and dd.quantity regexp #{orderDetail.deliveryDetail.quantity}
+            </if>
+            <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
+                and od.building_number regexp #{orderDetail.buildingNumber}
+            </if>
+            <if test="orderDetail.productId != null and orderDetail.productId != ''">
+                and od.product_id regexp #{orderDetail.productId}
+            </if>
+            <if test="orderDetail.productName != null and orderDetail.productName != ''">
+                and od.product_name regexp #{orderDetail.productName}
+            </if>
+            <if test="orderDetail.price != null and orderDetail.price != ''">
+                and od.price regexp #{orderDetail.price}
+            </if>
+            <if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
+                and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
+            </if>
+            <if test="orderDetail.deliveryDetail.money != null and orderDetail.deliveryDetail.money != ''">
+                and dd.money regexp  REGEXP_REPLACE(#{orderDetail.deliveryDetail.money},'\\.0+$','')
+            </if>
+            <if test="orderDetail.width != null and orderDetail.width != ''">
+                and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
+            </if>
+            <if test="orderDetail.height != null and orderDetail.height != ''">
+                and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
+            </if>
+            <if test="orderDetail.shape != null and orderDetail.shape != ''">
+                and od.shape regexp #{orderDetail.shape}
+            </if>
+            <if test="orderDetail.finishedGoodsInventory.actualSignalArea != null and orderDetail.finishedGoodsInventory.actualSignalArea != ''">
+                and fgi.actual_signal_area regexp REGEXP_REPLACE(#{orderDetail.finishedGoodsInventory.actualSignalArea},'\\.0+$','')
+            </if>
+            <if test="orderDetail.grossArea != null and orderDetail.grossArea != ''">
+                and od.gross_area regexp REGEXP_REPLACE(#{orderDetail.grossArea},'\\.0+$','')
+            </if>
+            <if test="orderDetail.computeArea != null and orderDetail.computeArea != ''">
+                and od.compute_area regexp REGEXP_REPLACE(#{orderDetail.computeArea},'\\.0+$','')
+            </if>
+            <if test="orderDetail.computeGrossArea != null and orderDetail.computeGrossArea != ''">
+                and od.compute_gross_area regexp REGEXP_REPLACE(#{orderDetail.computeGrossArea},'\\.0+$','')
+            </if>
+            <if test="orderDetail.processingNote != null and orderDetail.processingNote != ''">
+                and od.processing_note regexp #{orderDetail.processingNote}
+            </if>
+            <if test="orderDetail.edgingType != null and orderDetail.edgingType != ''">
+                and od.edging_type regexp #{orderDetail.edgingType}
+            </if>
+            <if test="orderDetail.perimeter != null and orderDetail.perimeter != ''">
+                and od.perimeter regexp #{orderDetail.perimeter}
+            </if>
+            <if test="orderDetail.deliveryDetail.deliveryDetailRemakes != null and orderDetail.deliveryDetail.deliveryDetailRemakes != ''">
+                and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}
+            </if>
         </where>
         limit #{offset},#{pageSize};
     </select>
 
-    <select id="getseletShippingOrderDetails" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
+    <select id="getSelectShippingOrderDetails" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
         select od.order_id,
                od.order_number,
                o.batch,
                fgi.quantity_available,
                od.quantity- od.delivery_num as t_quantity,
                od.quantity as o_quantity,
-               od.delivery_num as d_quantity,
+               fgi.quantity_available as d_quantity,
                od.building_number,
                od.product_id,
                od.product_name,
@@ -143,11 +341,68 @@
             <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
                 and od.order_id regexp #{orderDetail.orderId}
             </if>
+            <if test="orderDetail.order.batch != null and orderDetail.order.batch != ''">
+                and o.batch regexp #{orderDetail.order.batch}
+            </if>
+            <if test="orderDetail.finishedGoodsInventory.quantityAvailable != null and orderDetail.finishedGoodsInventory.quantityAvailable != ''">
+                and fgi.quantity_available regexp #{orderDetail.finishedGoodsInventory.quantityAvailable}
+            </if>
+            <if test="orderDetail.quantity != null and orderDetail.quantity != ''">
+                and od.quantity regexp #{orderDetail.quantity}
+            </if>
+            <if test="orderDetail.deliveryNum != null and orderDetail.deliveryNum != ''">
+                and od.delivery_num regexp #{orderDetail.deliveryNum}
+            </if>
+            <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
+                and od.building_number regexp #{orderDetail.buildingNumber}
+            </if>
+            <if test="orderDetail.productId != null and orderDetail.productId != ''">
+                and od.product_id regexp #{orderDetail.productId}
+            </if>
+            <if test="orderDetail.productName != null and orderDetail.productName != ''">
+                and od.product_name regexp #{orderDetail.productName}
+            </if>
+            <if test="orderDetail.price != null and orderDetail.price != ''">
+                and od.price regexp  REGEXP_REPLACE(#{orderDetail.price},'\\.0+$','')
+            </if>
+            <if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
+                and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
+            </if>
+            <if test="orderDetail.width != null and orderDetail.width != ''">
+                and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
+            </if>
+            <if test="orderDetail.height != null and orderDetail.height != ''">
+                and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
+            </if>
+            <if test="orderDetail.shape != null and orderDetail.shape != ''">
+                and od.shape regexp #{orderDetail.shape}
+            </if>
+            <if test="orderDetail.finishedGoodsInventory.actualSignalArea != null and orderDetail.finishedGoodsInventory.actualSignalArea != ''">
+                and fgi.actual_signal_area regexp REGEXP_REPLACE(#{orderDetail.finishedGoodsInventory.actualSignalArea},'\\.0+$','')
+            </if>
+            <if test="orderDetail.grossArea != null and orderDetail.grossArea != ''">
+                and od.gross_area regexp REGEXP_REPLACE(#{orderDetail.grossArea},'\\.0+$','')
+            </if>
+            <if test="orderDetail.computeArea != null and orderDetail.computeArea != ''">
+                and od.compute_area regexp REGEXP_REPLACE(#{orderDetail.computeArea},'\\.0+$','')
+            </if>
+            <if test="orderDetail.computeGrossArea != null and orderDetail.computeGrossArea != ''">
+                and od.compute_gross_area regexp REGEXP_REPLACE(#{orderDetail.computeGrossArea},'\\.0+$','')
+            </if>
+            <if test="orderDetail.processingNote != null and orderDetail.processingNote != ''">
+                and od.processing_note regexp #{orderDetail.processingNote}
+            </if>
+            <if test="orderDetail.edgingType != null and orderDetail.edgingType != ''">
+                and od.edging_type regexp #{orderDetail.edgingType}
+            </if>
+            <if test="orderDetail.perimeter != null and orderDetail.perimeter != ''">
+                and od.perimeter regexp #{orderDetail.perimeter}
+            </if>
         </where>
         limit #{offset},#{pageSize};
     </select>
 
-    <select id="getseletShippingOrderDetailsPageTotal">
+    <select id="getSelectShippingOrderDetailsPageTotal">
         select
         CEILING(count(od.id)/#{pageSize})
         from sd.order_detail od
@@ -159,7 +414,235 @@
             <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
                 and od.order_id regexp #{orderDetail.orderId}
             </if>
+            <if test="orderDetail.order.batch != null and orderDetail.order.batch != ''">
+                and o.batch regexp #{orderDetail.order.batch}
+            </if>
+            <if test="orderDetail.finishedGoodsInventory.quantityAvailable != null and orderDetail.finishedGoodsInventory.quantityAvailable != ''">
+                and fgi.quantity_available regexp #{orderDetail.finishedGoodsInventory.quantityAvailable}
+            </if>
+            <if test="orderDetail.quantity != null and orderDetail.quantity != ''">
+                and od.quantity regexp #{orderDetail.quantity}
+            </if>
+            <if test="orderDetail.deliveryNum != null and orderDetail.deliveryNum != ''">
+                and od.delivery_num regexp #{orderDetail.deliveryNum}
+            </if>
+            <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
+                and od.building_number regexp #{orderDetail.buildingNumber}
+            </if>
+            <if test="orderDetail.productId != null and orderDetail.productId != ''">
+                and od.product_id regexp #{orderDetail.productId}
+            </if>
+            <if test="orderDetail.productName != null and orderDetail.productName != ''">
+                and od.product_name regexp #{orderDetail.productName}
+            </if>
+            <if test="orderDetail.price != null and orderDetail.price != ''">
+                and od.price regexp  REGEXP_REPLACE(#{orderDetail.price},'\\.0+$','')
+            </if>
+            <if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
+                and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
+            </if>
+            <if test="orderDetail.width != null and orderDetail.width != ''">
+                and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
+            </if>
+            <if test="orderDetail.height != null and orderDetail.height != ''">
+                and od.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
+            </if>
+            <if test="orderDetail.shape != null and orderDetail.shape != ''">
+                and od.shape regexp #{orderDetail.shape}
+            </if>
+            <if test="orderDetail.finishedGoodsInventory.actualSignalArea != null and orderDetail.finishedGoodsInventory.actualSignalArea != ''">
+                and fgi.actual_signal_area regexp REGEXP_REPLACE(#{orderDetail.finishedGoodsInventory.actualSignalArea},'\\.0+$','')
+            </if>
+            <if test="orderDetail.grossArea != null and orderDetail.grossArea != ''">
+                and od.gross_area regexp REGEXP_REPLACE(#{orderDetail.grossArea},'\\.0+$','')
+            </if>
+            <if test="orderDetail.computeArea != null and orderDetail.computeArea != ''">
+                and od.compute_area regexp REGEXP_REPLACE(#{orderDetail.computeArea},'\\.0+$','')
+            </if>
+            <if test="orderDetail.computeGrossArea != null and orderDetail.computeGrossArea != ''">
+                and od.compute_gross_area regexp REGEXP_REPLACE(#{orderDetail.computeGrossArea},'\\.0+$','')
+            </if>
+            <if test="orderDetail.processingNote != null and orderDetail.processingNote != ''">
+                and od.processing_note regexp #{orderDetail.processingNote}
+            </if>
+            <if test="orderDetail.edgingType != null and orderDetail.edgingType != ''">
+                and od.edging_type regexp #{orderDetail.edgingType}
+            </if>
+            <if test="orderDetail.perimeter != null and orderDetail.perimeter != ''">
+                and od.perimeter regexp #{orderDetail.perimeter}
+            </if>
         </where>
         limit #{offset},#{pageSize};
     </select>
+
+
+    <select id="getSelectDeliveryDetailReport" resultMap="selectDeliveryDetail">
+        select dd.delivery_id,
+        dd.delivery_number,
+        d.payment_terms,
+        d.project,
+        d.customer_id,
+        d.customer_name,
+        d.delivery_date,
+        d.pay_method,
+        d.pay_date,
+        d.salesman,
+        d.creator,
+        d.contacts,
+        d.contact_number,
+        d.delivery_address,
+        dd.order_id,
+        dd.order_number,
+        dd.area,
+        dd.money,
+        dd.quantity,
+        dd.delivery_detail_remakes,
+        dd.create_time
+        from sd.delivery_detail dd
+        left join sd.delivery d on dd.delivery_id=d.delivery_id
+        <where>
+               and date(dd.create_time)>=#{startDate} and date(dd.create_time) &lt;= #{endDate}
+            <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
+                and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
+            </if>
+            <if test="deliveryDetail.deliveryNumber != null and deliveryDetail.deliveryNumber != ''">
+                and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')
+            </if>
+            <if test="deliveryDetail.orderId != null and deliveryDetail.orderId != ''">
+                and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')
+            </if>
+            <if test="deliveryDetail.orderNumber != null and deliveryDetail.orderNumber != ''">
+                and dd.order_number like concat('%', #{deliveryDetail.orderNumber},'%')
+            </if>
+            <if test="deliveryDetail.area != null and deliveryDetail.area != ''">
+                and dd.area like concat('%', #{deliveryDetail.area},'%')
+            </if>
+            <if test="deliveryDetail.money != null and deliveryDetail.money != ''">
+                and dd.money like concat('%', #{deliveryDetail.money},'%')
+            </if>
+            <if test="deliveryDetail.quantity != null and deliveryDetail.quantity != ''">
+                and dd.quantity like concat('%', #{deliveryDetail.quantity},'%')
+            </if>
+            <if test="deliveryDetail.deliveryDetailRemakes != null and deliveryDetail.deliveryDetailRemakes != ''">
+                and dd.delivery_detail_remakes like concat('%', #{deliveryDetail.deliveryDetailRemakes},'%')
+            </if>
+            <if test="deliveryDetail.createTime != null and deliveryDetail.createTime != ''">
+                and dd.create_time like concat('%', #{deliveryDetail.createTime},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.paymentTerms != null and deliveryDetail.delivery.paymentTerms != '')">
+                and d.payment_terms like concat('%', #{deliveryDetail.delivery.paymentTerms},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.project != null and deliveryDetail.delivery.project != '')">
+                and d.project like concat('%', #{deliveryDetail.delivery.project},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.customerId != null and deliveryDetail.delivery.customerId != '')">
+                and d.customer_id like concat('%', #{deliveryDetail.delivery.customerId},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.customerName != null and deliveryDetail.delivery.customerName != '')">
+                and d.customer_name like concat('%', #{deliveryDetail.delivery.customerName},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.deliveryDate != null and deliveryDetail.delivery.deliveryDate != '')">
+                and d.delivery_date like concat('%', #{deliveryDetail.delivery.deliveryDate},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.payMethod != null and deliveryDetail.delivery.payMethod != '')">
+                and d.pay_method like concat('%', #{deliveryDetail.delivery.payMethod},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.payDate != null and deliveryDetail.delivery.payDate != '')">
+                and d.pay_date like concat('%', #{deliveryDetail.delivery.payDate},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.salesman != null and deliveryDetail.delivery.salesman != '')">
+                and d.salesman like concat('%', #{deliveryDetail.delivery.salesman},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.creator != null and deliveryDetail.delivery.creator != '')">
+                and d.creator like concat('%', #{deliveryDetail.delivery.creator},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.contacts != null and deliveryDetail.delivery.contacts != '')">
+                and d.contacts like concat('%', #{deliveryDetail.delivery.contacts},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.contactNumber != null and deliveryDetail.delivery.contactNumber != '')">
+                and d.contact_number like concat('%', #{deliveryDetail.delivery.contactNumber},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.deliveryAddress != null and deliveryDetail.delivery.deliveryAddress != '')">
+                and d.delivery_address like concat('%', #{deliveryDetail.delivery.deliveryAddress},'%')
+            </if>
+
+        </where>
+        order by dd.delivery_id,dd.delivery_number
+        limit #{offset},#{pageSize};
+    </select>
+
+    <select id="getSelectDeliveryDetailReportPageTotal">
+        select CEILING(count(dd.id)/#{pageSize}) as 'pageTotal',
+        count(dd.id) as 'total'
+        from sd.delivery_detail dd
+        left join sd.delivery d on dd.delivery_id=d.delivery_id
+        <where>
+            and date(dd.create_time)>=#{startDate} and date(dd.create_time) &lt;= #{endDate}
+            <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
+                and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
+            </if>
+            <if test="deliveryDetail.deliveryNumber != null and deliveryDetail.deliveryNumber != ''">
+                and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')
+            </if>
+            <if test="deliveryDetail.orderId != null and deliveryDetail.orderId != ''">
+                and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')
+            </if>
+            <if test="deliveryDetail.orderNumber != null and deliveryDetail.orderNumber != ''">
+                and dd.order_number like concat('%', #{deliveryDetail.orderNumber},'%')
+            </if>
+            <if test="deliveryDetail.area != null and deliveryDetail.area != ''">
+                and dd.area like concat('%', #{deliveryDetail.area},'%')
+            </if>
+            <if test="deliveryDetail.money != null and deliveryDetail.money != ''">
+                and dd.money like concat('%', #{deliveryDetail.money},'%')
+            </if>
+            <if test="deliveryDetail.quantity != null and deliveryDetail.quantity != ''">
+                and dd.quantity like concat('%', #{deliveryDetail.quantity},'%')
+            </if>
+            <if test="deliveryDetail.deliveryDetailRemakes != null and deliveryDetail.deliveryDetailRemakes != ''">
+                and dd.delivery_detail_remakes like concat('%', #{deliveryDetail.deliveryDetailRemakes},'%')
+            </if>
+            <if test="deliveryDetail.createTime != null and deliveryDetail.createTime != ''">
+                and dd.create_time like concat('%', #{deliveryDetail.createTime},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.paymentTerms != null and deliveryDetail.delivery.paymentTerms != '')">
+                and d.payment_terms like concat('%', #{deliveryDetail.delivery.paymentTerms},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.project != null and deliveryDetail.delivery.project != '')">
+                and d.project like concat('%', #{deliveryDetail.delivery.project},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.customerId != null and deliveryDetail.delivery.customerId != '')">
+                and d.customer_id like concat('%', #{deliveryDetail.delivery.customerId},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.customerName != null and deliveryDetail.delivery.customerName != '')">
+                and d.customer_name like concat('%', #{deliveryDetail.delivery.customerName},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.deliveryDate != null and deliveryDetail.delivery.deliveryDate != '')">
+                and d.delivery_date like concat('%', #{deliveryDetail.delivery.deliveryDate},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.payMethod != null and deliveryDetail.delivery.payMethod != '')">
+                and d.pay_method like concat('%', #{deliveryDetail.delivery.payMethod},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.payDate != null and deliveryDetail.delivery.payDate != '')">
+                and d.pay_date like concat('%', #{deliveryDetail.delivery.payDate},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.salesman != null and deliveryDetail.delivery.salesman != '')">
+                and d.salesman like concat('%', #{deliveryDetail.delivery.salesman},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.creator != null and deliveryDetail.delivery.creator != '')">
+                and d.creator like concat('%', #{deliveryDetail.delivery.creator},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.contacts != null and deliveryDetail.delivery.contacts != '')">
+                and d.contacts like concat('%', #{deliveryDetail.delivery.contacts},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.contactNumber != null and deliveryDetail.delivery.contactNumber != '')">
+                and d.contact_number like concat('%', #{deliveryDetail.delivery.contactNumber},'%')
+            </if>
+            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.deliveryAddress != null and deliveryDetail.delivery.deliveryAddress != '')">
+                and d.delivery_address like concat('%', #{deliveryDetail.delivery.deliveryAddress},'%')
+            </if>
+
+        </where>
+        order by dd.delivery_id,dd.delivery_number
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0