优化

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

@@ -178,8 +178,6 @@ public class AppBusSalesOrderVo implements Vo {
     private String modelName;
     @ApiModelProperty("销售部门")
     private String orgName;
-    @ApiModelProperty("采购订单sid")
-    private String linkSid;
     @ApiModelProperty("排产订单编号")
     private String orderingNo;
     @ApiModelProperty("贴息")

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

@@ -46,4 +46,8 @@ public class OrderQuery implements Query {
     private String orgName;
     @ApiModelProperty("中介返利")
     private String distributorPriceAll;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("排产订单编号")
+    private String orderingNo;
 }

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

@@ -39,7 +39,9 @@
     </update>
     <!--app查询销售订单列表-->
     <select id="getSaleOrders" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo">
-        SELECT bo.sid as saleOrderSid,
+        SELECT
+        DISTINCT
+        bo.sid as saleOrderSid,
         bo.billNo as saleOrderId,
         bo.customerClassKey as customerType,
         bo.customerSid,
@@ -54,11 +56,9 @@
         case bo.isInsurance
         when 0 then '否'
         when 1 then '是' end as insuranceInfo,
-        <!--               if(bo.nodeState = '已办结', true, false)  as showContractBtn,-->
         if(bo.nodeState = '已办结', true, false) as showStopBtn,
         bo.nodeState is null as showUpdateBtn,
         bo.nodeState is null as showDeleteBtn,
-        -- bo.nodeState is not null as showRePublishBtn,
         0 as showFinancialBtn,
         bo.type,
         bo.contractNo as contractId,
@@ -66,17 +66,21 @@
         bo.procDefId,
         bo.procInstId,
         bo.useOrgSid,
+        bo.useOrgName,
         bo.purchaseSystemName,
         bo.orgName,
         bm.modelName,
-        bsvo.linkSid,
-        bsos.distributorPriceAll
-        FROM bus_sales_order bo
+        bsos.distributorPriceAll,
+        ls.`factoryDiscount`,
+        GROUP_CONCAT(bsvo.`linkNo`) AS vinNo,
+        GROUP_CONCAT(bsvo.`orderingNo`) as orderingNo
+        FROM bus_sales_vehicle_order bsvo
         left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
         left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid
         left join bus_sales_order_model bm on bm.salesOrderSid = bo.sid
-        left join bus_sales_vehicle_order bsvo on bsvo.salesOrderSid = bo.sid
+        left join bus_sales_order bo on bsvo.salesOrderSid = bo.sid
         left join bus_sales_order_submit bsos on bsos.salesOrderSid = bo.sid
+        LEFT JOIN anrui_riskcenter.`loan_solutions` ls ON ls.`salesOrderSid` = bo.sid
         <where>
             ${ew.sqlSegment}
             <if test="name != null and name != ''">

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

@@ -5789,17 +5789,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (StringUtils.isNotBlank(pagerQuery.getDistributorPriceAll())){
             qw.like("bsos.distributorPriceAll",pagerQuery.getDistributorPriceAll());
         }
+        qw.groupBy("bo.sid");
+        qw.having("vinNo LIKE %",pagerQuery.getVinNo(),"%");
+        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()) {
-            List<String> vinList = busSalesOrderVehicleService.selectList(record.getSaleOrderSid());
-            vinList.removeAll(Collections.singleton(null));
-            if(!vinList.isEmpty()){
-                record.setVinNo(String.join(",",vinList));
-            }else{
-                record.setVinNo("暂无");
-            }
-
             record.setShowStopBtn(false);
             record.setShowContractBtn(false);
             if (StringUtils.isNotBlank(record.getCustomerImage())) {
@@ -5853,22 +5848,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     record.setEndTime(flowSelectVo.getEndTime());
                 }
             }
-            //分公司名称
-            String useOrgSid = record.getUseOrgSid();
-            String useOrgName = sysOrganizationFeign.fetchBySid(useOrgSid).getData().getName();
-            record.setUseOrgName(useOrgName);
-            //排产订单编号
-            String linkSid = record.getLinkSid();
-            if (StringUtils.isNotBlank(linkSid)){
-                BusVehicleOrderVo busVehicleOrderVo = busVehicleOrderFeign.fetchBySid(linkSid).getData();
-                record.setOrderingNo(busVehicleOrderVo.getApplicationCode());
-            }
-            //贴息
-            String saleOrderSid = record.getSaleOrderSid();
-            SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetailsss(saleOrderSid).getData();
-            if (solutionsDetailsVo != null){
-                record.setFactoryDiscount(solutionsDetailsVo.getFactoryDiscount());
-            }
         }
         PagerVo<AppBusSalesOrderVo> p = PagerUtil.pageToVo(pagging, null);
         return p;