Merge branch 'gaixiankang' into 'dev'

bug - 71087

See merge request !279

quality-review/src/main/resources/mapper/TaskMapper.xml

@@ -315,8 +315,8 @@
             SUBSTRING_INDEX(GROUP_CONCAT(distinct ae.enterprise_name), ',', 1) AS productionEnterprise,
             SUBSTRING_INDEX(GROUP_CONCAT(s.sample_sender), ',', 1) AS sampleSender,
             SUBSTRING_INDEX(GROUP_CONCAT(distinct DATE_FORMAT(s.delivery_date, '%Y-%m-%d')), ',', 1) AS sampleDeliveryDate,
-            count(s.id) AS sampleQuantity,
-            CONVERT(sum(s.number_of_samples), UNSIGNED) AS sampleSum,
+            sum(CASE WHEN s.flag = '0' THEN 1 ELSE 0 END) AS sampleQuantity,
+            CONVERT(sum(CASE WHEN s.flag = '0' THEN s.number_of_samples ELSE 0 END), UNSIGNED) AS sampleSum,
             GROUP_CONCAT(distinct DATE_FORMAT(s.manufacture_date, '%Y-%m-%d')) AS sampleDeliveryDate,
             t.product_model AS vehicleModel,
             t.id AS taskNumber,