diff --git a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml index f71825a..b41b6eb 100644 --- a/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml +++ b/WebContent/WEB-INF/classes/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml @@ -1047,7 +1047,7 @@ SELECT 1 FROM shipment_log SL WHERE SL.target_objid = T.PROJECT_NO AND SL.shipping_date IS NOT NULL - AND SL.shipping_date >= TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD') + AND SL.shipping_date =]]> TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD') ) @@ -1055,7 +1055,7 @@ SELECT 1 FROM shipment_log SL WHERE SL.target_objid = T.PROJECT_NO AND SL.shipping_date IS NOT NULL - AND SL.shipping_date <= TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD') + INTERVAL '1 day' + AND SL.shipping_date TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD') + INTERVAL '1 day' ) @@ -1216,7 +1216,7 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC SELECT 1 FROM shipment_log SL WHERE SL.target_objid = T.PROJECT_NO AND SL.shipping_date IS NOT NULL - AND SL.shipping_date >= TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD') + AND SL.shipping_date =]]> TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD') ) @@ -1224,7 +1224,7 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC SELECT 1 FROM shipment_log SL WHERE SL.target_objid = T.PROJECT_NO AND SL.shipping_date IS NOT NULL - AND SL.shipping_date <= TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD') + INTERVAL '1 day' + AND SL.shipping_date TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD') + INTERVAL '1 day' ) diff --git a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml index f71825a..b41b6eb 100644 --- a/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml +++ b/src/com/pms/salesmgmt/mapper/salesNcollectMgmt.xml @@ -1047,7 +1047,7 @@ SELECT 1 FROM shipment_log SL WHERE SL.target_objid = T.PROJECT_NO AND SL.shipping_date IS NOT NULL - AND SL.shipping_date >= TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD') + AND SL.shipping_date =]]> TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD') ) @@ -1055,7 +1055,7 @@ SELECT 1 FROM shipment_log SL WHERE SL.target_objid = T.PROJECT_NO AND SL.shipping_date IS NOT NULL - AND SL.shipping_date <= TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD') + INTERVAL '1 day' + AND SL.shipping_date TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD') + INTERVAL '1 day' ) @@ -1216,7 +1216,7 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC SELECT 1 FROM shipment_log SL WHERE SL.target_objid = T.PROJECT_NO AND SL.shipping_date IS NOT NULL - AND SL.shipping_date >= TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD') + AND SL.shipping_date =]]> TO_DATE(#{shippingDateFrom}, 'YYYY-MM-DD') ) @@ -1224,7 +1224,7 @@ ORDER BY T.REGDATE DESC, T.PROJECT_NO DESC SELECT 1 FROM shipment_log SL WHERE SL.target_objid = T.PROJECT_NO AND SL.shipping_date IS NOT NULL - AND SL.shipping_date <= TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD') + INTERVAL '1 day' + AND SL.shipping_date TO_DATE(#{shippingDateTo}, 'YYYY-MM-DD') + INTERVAL '1 day' )