‘linchangsheng’ vor 5 Monaten
Ursprung
Commit
3094df5f2d

+ 8 - 8
mall-server-api/src/main/resources/mapper/workorder/IncreMapper.xml

@@ -113,7 +113,7 @@
                 #{item}
             </foreach>
         </if>
-        LEFT JOIN websit_dispatch f on a.id = f.street_code and b.dict_code = f.dict_code and c.id = f.order_small_id and d.category_id = f.category_id and e.dict_code = f.order_source_id
+        LEFT JOIN websit_dispatch f on a.id = f.street_code and b.dict_code = f.sale_type_id and c.id = f.order_small_id and d.category_id = f.category_id
         <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
             AND f.company_wechat_id IN
             <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
@@ -187,7 +187,7 @@
             </foreach>
         </if>
 
-        LEFT JOIN websit_dispatch f on a.id = f.street_code and b.dict_code = f.dict_code and c.id = f.order_small_id and d.category_id = f.category_id and e.dict_code = f.order_source_id
+        LEFT JOIN websit_dispatch f on a.id = f.street_code and b.dict_code = f.sale_type_id and c.id = f.order_small_id and d.category_id = f.category_id
         <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
             AND f.company_wechat_id IN
             <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
@@ -262,7 +262,7 @@
             </foreach>
         </if>
 
-        LEFT JOIN websit_dispatch f on a.id = f.street_code and b.dict_code = f.dict_code and c.id = f.order_small_id and d.category_id = f.category_id and e.dict_code = f.order_source_id
+        LEFT JOIN websit_dispatch f on a.id = f.street_code and b.dict_code = f.sale_type_id and c.id = f.order_small_id and d.category_id = f.category_id
         <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
             AND f.company_wechat_id IN
             <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
@@ -335,7 +335,7 @@
             </foreach>
         </if>
 
-        LEFT JOIN websit_dispatch f on a.id = f.street_code and b.dict_code = f.dict_code and c.id = f.order_small_id and d.category_id = f.category_id and e.dict_code = f.order_source_id
+        LEFT JOIN websit_dispatch f on a.id = f.street_code and b.dict_code = f.sale_type_id and c.id = f.order_small_id and d.category_id = f.category_id
         <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
             AND f.company_wechat_id IN
             <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
@@ -409,7 +409,7 @@
             </foreach>
         </if>
 
-        LEFT JOIN websit_dispatch f on a.id = f.street_code and b.dict_code = f.dict_code and c.id = f.order_small_id and d.category_id = f.category_id and e.dict_code = f.order_source_id
+        LEFT JOIN websit_dispatch f on a.id = f.street_code and b.dict_code = f.sale_type_id and c.id = f.order_small_id and d.category_id = f.category_id
         <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
             AND f.company_wechat_id IN
             <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
@@ -489,7 +489,7 @@
             </foreach>
         </if>
 
-        LEFT JOIN websit_dispatch f on a.id = f.street_code and b.dict_code = f.dict_code and c.id = f.order_small_id and d.category_id = f.category_id and e.dict_code = f.order_source_id
+        LEFT JOIN websit_dispatch f on a.id = f.street_code and b.dict_code = f.sale_type_id and c.id = f.order_small_id and d.category_id = f.category_id
         <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
             AND f.company_wechat_id IN
             <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
@@ -564,7 +564,7 @@
             </foreach>
         </if>
 
-        LEFT JOIN websit_dispatch f on a.id = f.street_code and b.dict_code = f.dict_code and c.id = f.order_small_id and d.category_id = f.category_id and e.dict_code = f.order_source_id
+        LEFT JOIN websit_dispatch f on a.id = f.street_code and b.dict_code = f.sale_type_id and c.id = f.order_small_id and d.category_id = f.category_id
         <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
             AND f.company_wechat_id IN
             <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
@@ -639,7 +639,7 @@
             </foreach>
         </if>
 
-        LEFT JOIN websit_dispatch f on a.id = f.street_code and b.dict_code = f.dict_code and c.id = f.order_small_id and d.category_id = f.category_id and e.dict_code = f.order_source_id
+        LEFT JOIN websit_dispatch f on a.id = f.street_code and b.dict_code = f.sale_type_id and c.id = f.order_small_id and d.category_id = f.category_id
         <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
             AND f.company_wechat_id IN
             <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">