采购分页 优化

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/po/Purchase.java

@@ -125,4 +125,9 @@ public class Purchase extends BasePo {
      * 采购部门id
      */
     private Long deptId;
+
+    /**
+     * 归属项目组
+     */
+    private Long teamId;
 }

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

@@ -208,8 +208,9 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
                     .or().in("p", Purchase::getSupplyId, supplierInfoIds)
                     .or().like("p", Purchase::getPurchaseName, dto.getKeyword())
                     //根据明细 产品名称 产品编号 过滤
-                    .or().like("pi.name", dto.getKeyword())
-                    .or().like("pi.custom_code", dto.getKeyword())
+//                    .or().like("pi.name", dto.getKeyword())
+//                    .or().like("pi.custom_code", dto.getKeyword())
+                    .or().exists("SELECT pd.purchase_id FROM purchase_detail pd LEFT JOIN bytesailing_item.product_info pi ON pd.bussiness_id = pi.id WHERE ( pi.`name` LIKE CONCAT( '%', {0}, '%' ) OR pi.custom_code LIKE CONCAT( '%', {0}, '%' ))",dto.getKeyword())
             );
         }
         //高级检索

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

@@ -35,9 +35,7 @@
                IF(sum( dg.`status` ) != count( dg.`status` ), 1, 0) isTransit,
                de.dept_name
         FROM purchase p
-                 LEFT JOIN purchase_detail pd ON pd.purchase_id = p.id
-                 LEFT JOIN bytesailing_item.product_info pi ON pd.bussiness_id = pi.id
-                 LEFT JOIN bytesailing_base.sys_dept de ON pi.deptIdWdly = de.dept_id
+                 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
             ${ew.customSqlSegment}
     </sql>
@@ -51,9 +49,7 @@
                     p.amount
                 FROM
                     purchase p
-                        LEFT JOIN purchase_detail pd ON pd.purchase_id = p.id
-                        LEFT JOIN bytesailing_item.product_info pi ON pd.bussiness_id = pi.id
-                        LEFT JOIN bytesailing_base.sys_dept de ON pi.deptIdWdly = de.dept_id
+                        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
                     ${ew.customSqlSegment}
             ) t1

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/abnormal/impl/AbnormalInfoServiceImpl.java

@@ -75,7 +75,7 @@ public class AbnormalInfoServiceImpl extends ServiceImpl<AbnormalInfoMapper, Abn
             }
         }
 
-//        wrapper.groupBy("ai.id");
+        wrapper.groupBy("ai.id");
 
         wrapper.orderByDesc("ai", AbnormalInfo::getId);
         Assert.notEmpty(dto.getType(), "异常来源类型不能为空");