Prechádzať zdrojové kódy

1、趟次停止接单车辆任务完成数统计调整;

zk 2 rokov pred
rodič
commit
e4ee5c151b

+ 8 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderMapper.java

@@ -141,6 +141,14 @@ public interface KwtLogisticsOrderMapper extends BaseMapper<KwtLogisticsOrder> {
      */
     List<DriverListVo> selectDriverListById(@Param("driverParam") DriverParam driverParam);
 
+    /**
+     * 通过物流订单查看单据下运力司机数据【趟次】
+     *
+     * @param driverParam
+     * @return
+     */
+    List<DriverListVo> selectDriverCountById(@Param("driverParam") DriverParam driverParam);
+
     /**
      * @param ids
      * @return

+ 6 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/AcceptCarriageOrderService.java

@@ -1167,9 +1167,15 @@ public class AcceptCarriageOrderService {
                     truck = fleetService.findTruck(collect);
                 }
             }
+            //只展示待接单数据统计
+            List<DriverListVo> truckCount = logisticsOrderMapper.selectDriverCountById(driverParam);
+            Map<String, Integer> truckMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            truckCount.forEach(entity -> { truckMap.put(entity.getTruckNo(), entity.getCount());});
+
             Map<String, String> dictData = commonService.getDictData(DictTypeEnum.TRUCK_TYPE.getType());
             for (DriverListVo driverListVo : list) {
                 driverListVo.setStatusLabel(CarWaybillEnum.getName(driverListVo.getStatus()));
+                driverListVo.setCount(truckMap.get(driverListVo.getTruckNo()));
                 if (!ObjectUtils.isEmpty(truck)) {
                     if (truck.get(driverListVo.getTruckNo()) != null) {
                         driverListVo.setTransportStatus(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getBusinessStatus());

+ 30 - 0
sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -709,6 +709,36 @@
         </where>
     </select>
 
+    <select id="selectDriverCountById" resultType="com.sckw.transport.model.vo.DriverListVo">
+        SELECT
+        count(1) AS count,
+        b.truck_no AS truckNo
+        FROM
+        kwt_waybill_order b
+        <where>
+            b.del_flag = 0
+            AND b.type = '1'
+            AND b.status in (7, 8, 13)
+            <if test="driverParam.lOrderId != null and driverParam.lOrderId != ''">
+                AND b.l_order_id =#{driverParam.lOrderId}
+            </if>
+            <if test="driverParam.driverName != null and driverParam.driverName != '' or ( driverParam.driverPhone != null and driverParam.driverPhone != '' ) or ( driverParam.truckNo != null and driverParam.truckNo != '' ) ">
+                <!--                and (-->
+                <if test="driverParam.driverName != null and driverParam.driverName != ''">
+                    and b.driver_name like concat('%',#{driverParam.driverName},'%')
+                </if>
+                <if test="driverParam.driverPhone != null and driverParam.driverPhone != ''">
+                    and b.driver_phone like concat('%',#{driverParam.driverPhone},'%')
+                </if>
+                <if test="driverParam.truckNo != null and driverParam.truckNo != ''">
+                    and b.truck_no like concat('%',#{driverParam.truckNo},'%')
+                </if>
+            </if>
+            GROUP BY
+            b.truck_no
+        </where>
+    </select>
+
     <select id="selectLogisticOrderList" resultType="com.sckw.transport.api.model.dto.LogisticsOrderDTO">
         SELECT
         DISTINCT a.id AS lOrderId,