Merge branch 'master_sample_order' into master_after0225

@@ -234,21 +234,39 @@
     </select>
     </select>
 
 
     <select id="getCustomerSpecificQualityRequirements" resultMap="ContractDistributorStandard">
     <select id="getCustomerSpecificQualityRequirements" resultMap="ContractDistributorStandard">
-        WITH LatestContracts AS (SELECT cdl.product_id,
-        cdl.contract_id,
-        cds.*,
-        ROW_NUMBER() OVER (PARTITION BY cdl.product_id ORDER BY cds.create_time DESC, cds.id DESC) as rn
-        FROM tbl_contract_distributor_line cdl
-        INNER JOIN tbl_contract_distributor_standard cds ON cdl.contract_id = cds.id
-        WHERE cds.STATUS != 'DELETED'
-        and cds.buyer = #{customerId}
-        and cdl.product_id IN
-        <foreach collection="productIdList" open="(" separator="," close=")" item="item">
-            #{item}
-        </foreach>
+        WITH ContractLines AS (
+            SELECT
+                cdl.product_id,
+                cds.*
+            FROM tbl_contract_distributor_standard cds
+            INNER JOIN tbl_contract_distributor_line cdl ON cds.id = cdl.contract_id
+            WHERE cds.STATUS != 'DELETED'
+            AND cds.buyer = #{customerId}
+            AND cdl.product_id IN
+            <foreach collection="productIdList" open="(" separator="," close=")" item="item">
+                #{item}
+            </foreach>
+            UNION ALL
+            SELECT
+                cspl.product_id,
+                cds.*
+            FROM tbl_contract_distributor_standard cds
+            INNER JOIN tbl_contract_std_processing_line cspl ON cds.id = cspl.contract_id
+            WHERE cds.STATUS != 'DELETED'
+            AND cds.buyer = #{customerId}
+            AND cspl.product_id IN
+            <foreach collection="productIdList" open="(" separator="," close=")" item="item">
+                #{item}
+            </foreach>
+        ),
+        RankedContracts AS (
+            SELECT
+                cl.*,
+                ROW_NUMBER() OVER (PARTITION BY cl.product_id ORDER BY cl.create_time DESC, cl.id DESC) as rn
+            FROM ContractLines cl
         )
         )
         SELECT *
         SELECT *
-        FROM LatestContracts
+        FROM RankedContracts
         WHERE rn = 1
         WHERE rn = 1
         ORDER BY create_time;
         ORDER BY create_time;
     </select>
     </select>