bug240 控货导出数据有误

yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml

@@ -2628,6 +2628,20 @@
         <if test="query.userType == 2 ">
             AND ((o.user_id is not null AND o.user_id > 0 AND o.`status` != 0) or o.user_id is null or o.user_id = 0)
         </if>
+        <if test = 'query.cargoControlStatusList != null and query.cargoControlStatusList.size() > 0 '>
+            AND (1!=1
+            <foreach item='cargoControlStatus' index="index" collection='query.cargoControlStatusList'>
+                <choose>
+                    <when test="cargoControlStatus == 3">
+                        or o.`cargo_control_status` = 1 AND (select count(1) from ecw_order_cargo_control_pick ccp2 where ccp2.order_id = o.order_id and ccp2.status = 1) > 0
+                    </when>
+                    <otherwise>
+                        or o.`cargo_control_status` = #{cargoControlStatus}
+                    </otherwise>
+                </choose>
+            </foreach>
+            )
+        </if>
     </sql>
 
 
@@ -5033,8 +5047,6 @@
         o.audit_result,
         o.guan_lian_order_status,
         o.transport_id,
---         (select ifnull(sum(ccp.pick_num),0) from ecw_order_cargo_control_pick ccp where ccp.order_id = o.order_id and
---         ccp.status in(1,2,3,4) ) as release_num,
         o.release_num,
         o.release_ratio,
         o.is_cargo_control,