优化

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/OrderQuery.java

@@ -50,4 +50,8 @@ public class OrderQuery implements Query {
     private String vinNo;
     @ApiModelProperty("排产订单编号")
     private String orderingNo;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("贴息")
+    private String factoryDiscount;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -5789,9 +5789,24 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (StringUtils.isNotBlank(pagerQuery.getDistributorPriceAll())){
             qw.like("bsos.distributorPriceAll",pagerQuery.getDistributorPriceAll());
         }
+        //分公司名称
+        if (StringUtils.isNotBlank(pagerQuery.getUseOrgName())){
+            qw.like("bo.useOrgName",pagerQuery.getUseOrgName());
+        }
+        //贴息
+        if (StringUtils.isNotBlank(pagerQuery.getFactoryDiscount())){
+            qw.like("ls.factoryDiscount",pagerQuery.getFactoryDiscount());
+        }
+        //根据销售订单sid分组
         qw.groupBy("bo.sid");
-        qw.having("vinNo LIKE %",pagerQuery.getVinNo(),"%");
-        qw.having("orderingNo LIKE %",pagerQuery.getOrderingNo(),"%");
+        //车架号
+        if (StringUtils.isNotBlank(pagerQuery.getVinNo())){
+            qw.having("vinNo LIKE %",pagerQuery.getVinNo(),"%");
+        }
+        //排产订单编号
+        if (StringUtils.isNotBlank(pagerQuery.getOrderingNo())){
+            qw.having("orderingNo LIKE %",pagerQuery.getOrderingNo(),"%");
+        }
         String typeState = "getSaleOrdersByOrgPath";//查询接口的标识
         IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), typeState);
         for (AppBusSalesOrderVo record : pagging.getRecords()) {