已采购分页优化

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchaseServiceImpl.java

@@ -272,7 +272,7 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
         wrapper.ge("p", Purchase::getCreateTime, dto.getBeginTime());
         wrapper.le("p", Purchase::getCreateTime, dto.getEndTime());
 
-        wrapper.groupBy("p.id");
+//        wrapper.groupBy("p.id");
         return wrapper;
     }
 

hx-purchase/src/main/resources/mapper/purchase/PurchaseMapper.xml

@@ -32,14 +32,22 @@
                p.count,
                p.data_resource,
                p.data_resource_id,
---                IF(sum( dg.`status` ) != count( dg.`status` ), 1, 0) isTransit,
-               IF(((sum( dg.`status` ) != count( dg.`status` )) or sum(IF( sw.`status` != 2, 1, 0 ))>0) , 1, 0 ) isTransit,
+               IFNULL( t1.isTransit, 0 ) AS isTransit,
                de.dept_name,
                p.contractCode
         FROM purchase p
                  LEFT JOIN bytesailing_base.sys_dept de ON p.team_id = de.dept_id
-                 LEFT JOIN bytesailing_victoriatourist.deliver_goods dg ON dg.purchase_id = p.id
-                 LEFT JOIN bytesailing_wms.stock_wait sw ON sw.deliverGoodsId = dg.id
+                 LEFT JOIN (
+                    SELECT
+                        dg.purchase_id,
+        --                IF(sum( dg.`status` ) != count( dg.`status` ), 1, 0) isTransit,
+                        IF(((sum( dg.`status` ) != count( dg.`status` )) or sum(IF( sw.`status` != 2, 1, 0 ))>0) , 1, 0 ) isTransit
+                    FROM
+                        bytesailing_victoriatourist.deliver_goods dg
+                            LEFT JOIN bytesailing_wms.stock_wait sw ON sw.deliverGoodsId = dg.id
+                    GROUP BY
+                        dg.purchase_id
+                ) t1 ON t1.purchase_id = p.id
             ${ew.customSqlSegment}
     </sql>