‘linchangsheng’ 7 月之前
父节点
当前提交
637a9046c6

+ 1 - 1
mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -337,7 +337,7 @@
             )
         </if>
         <if test="ex.orderStatus != null and ex.orderStatus.key =='DJD'.toString()">
-            and a.is_meet =0 or a.order_status  IN ('DJD')
+            and (a.is_meet =0 or a.order_status  IN ('DJD')) and a.order_status not in ('YQX','FWQX','FL','FWZT','YCGB')
         </if>
         <if test="ex.partsApplyStatus != null and ex.partsApplyStatus =='PJSQZ'.toString()">
             and a.id in(select order_base_id from websit_parts_apply where `status` = 'ING')

+ 1 - 1
mall-server-api/src/main/resources/mapper/workorder/OrderBaseCMapper.xml

@@ -45,7 +45,7 @@
         'DJD' as 'orderStatus',
         '待接单' as 'orderStatusText'
         from pg_order_base a
-        where is_meet=0 or a.order_status  IN ('DJD')
+        where (is_meet=0 or a.order_status  IN ('DJD')) and a.order_status not in ('YQX','FWQX','FL','FWZT','YCGB')
         <include refid="orderBaseSqlWhere"></include>
         <if test="orderSmallType != null and orderSmallType != ''">
             and a.order_small_type = #{orderSmallType}