优化车辆信息,将客户的数据拉入我们的库

liujun001
1 parent d36bdb05
Showing 7 changed files with 123 additions and 17 deletions
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderCarStatistics.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDriver.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchHandlerService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchHandlerServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-ui/src/views/gar/order/index.vue
+package com.trash.garbage.pojo.vo;
+
+public class OrderCarStatistics {
+    private String carType;
+    private Integer number;
+
+    public String getCarType() {
+        return carType;
+    }
+
+    public void setCarType(String carType) {
+        this.carType = carType;
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+}
@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
@@ -87,6 +88,10 @@ public class OrderDetailVo {
      * 车辆信息
      */
     private List<GarOrderCar> garCarInfoList;
+
+    private Collection<OrderCarStatistics> orderCarStatistics;
+
+    private Collection<OrderDriver> orderDrivers;
     /***
      *
      * 垃圾处置场信息
@@ -451,4 +456,20 @@ public class OrderDetailVo {
     public void setGarEstimatedCost(String garEstimatedCost) {
         this.garEstimatedCost = garEstimatedCost;
     }
+
+    public Collection<OrderCarStatistics> getOrderCarStatistics() {
+        return orderCarStatistics;
+    }
+
+    public void setOrderCarStatistics(Collection<OrderCarStatistics> orderCarStatistics) {
+        this.orderCarStatistics = orderCarStatistics;
+    }
+
+    public Collection<OrderDriver> getOrderDrivers() {
+        return orderDrivers;
+    }
+
+    public void setOrderDrivers(Collection<OrderDriver> orderDrivers) {
+        this.orderDrivers = orderDrivers;
+    }
 }
+package com.trash.garbage.pojo.vo;
+
+public class OrderDriver {
+    private String driverName;
+    private String driverPhone;
+
+    public String getDriverName() {
+        return driverName;
+    }
+
+    public void setDriverName(String driverName) {
+        this.driverName = driverName;
+    }
+
+    public String getDriverPhone() {
+        return driverPhone;
+    }
+
+    public void setDriverPhone(String driverPhone) {
+        this.driverPhone = driverPhone;
+    }
+}
@@ -15,4 +15,5 @@ import java.util.Set;
 public interface GarOrderMatchHandlerService extends IService<GarOrderMatchHandler> {
     List<DispatchDriverVo> queryDriverListWithDispatchStatus(String orderId, String companyId, Set<String> containerVolumees);
+    List<GarOrderMatchHandler> queryByOrderId(String orderId);
 }
 package com.trash.garbage.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.trash.garbage.mapper.GarOrderMatchHandlerMapper;
 import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
@@ -7,6 +8,7 @@ import com.trash.garbage.pojo.vo.DispatchDriverVo;
 import com.trash.garbage.service.GarOrderMatchHandlerService;
 import org.springframework.stereotype.Service;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
@@ -23,6 +25,13 @@ public class GarOrderMatchHandlerServiceImpl extends ServiceImpl&lt;GarOrderMatchHa
     public List<DispatchDriverVo> queryDriverListWithDispatchStatus(String orderId, String id, Set<String> containerVolumees) {
         return baseMapper.queryDriverListWithDispatchStatus(orderId, id,containerVolumees);
     }
+
+    @Override
+    public List<GarOrderMatchHandler> queryByOrderId(String orderId) {
+        LambdaQueryWrapper<GarOrderMatchHandler> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(GarOrderMatchHandler::getGarOrderId,orderId);
+        return list(wrapper);
+    }
 }
@@ -664,17 +664,40 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 vo.setGarOrderHandleName(driverVos.get(0).getName());
                 vo.setGarOrderHandleTel(driverVos.get(0).getPhoneNo());
             }
-        } else if (StringUtils.isNotEmpty(vo.getGarOrderCompanyTel())) {
-            TransportationEnterprise enterprise = transportationEnterpriseService.queryByServerPhone(vo.getGarOrderCompanyTel());
-            if(Objects.nonNull(enterprise)){
-                vo.setGarOrderHandleName(enterprise.getLegalRepresentative());
-                vo.setGarOrderHandleTel(enterprise.getLegalRepresentativePhone());
+        } else {
+            List<GarOrderMatchHandler> matchHandlers = handlerService.queryByOrderId(id);
+            int size = CollectionUtils.size(matchHandlers);
+            if (size > 0) {
+                Set<OrderDriver> orderDrivers = new LinkedHashSet<>();
+                for (int i = 0; i < size; i++) {
+                    DriverVo driverVo = new DriverVo();
+                    driverVo.setPhoneNo(matchHandlers.get(i).getGarOrderHandlerTel());
+                    driverVos = driverService.selectDriverList(driverVo);
+                    if (CollectionUtil.isNotEmpty(driverVos)) {
+                        OrderDriver od = new OrderDriver();
+                        od.setDriverName(driverVos.get(0).getName());
+                        od.setDriverPhone(driverVos.get(0).getPhoneNo());
+                        orderDrivers.add(od);
+                    }
+                }
+                vo.setOrderDrivers(orderDrivers);
             }
         }
         // 获取车辆信息
         LambdaQueryWrapper<GarOrderCar> qwc = new LambdaQueryWrapper<>();
         qwc.eq(GarOrderCar::getGarOrderId, id);
         List<GarOrderCar> carList = garOrderCarService.list(qwc);
+        if (CollectionUtils.isNotEmpty(carList)) {
+            Map<String, List<GarOrderCar>> groupCars = carList.stream().collect(Collectors.groupingBy(GarOrderCar::getGarOrderCarType));
+            Set<OrderCarStatistics> orderCarStatistics = new LinkedHashSet<>();
+            for (Map.Entry<String, List<GarOrderCar>> entry : groupCars.entrySet()) {
+                OrderCarStatistics statistics = new OrderCarStatistics();
+                statistics.setCarType(entry.getKey());
+                statistics.setNumber(CollectionUtils.size(entry.getValue()));
+                orderCarStatistics.add(statistics);
+            }
+            vo.setOrderCarStatistics(orderCarStatistics);
+        }
         vo.setGarCarInfoList(carList);
         return vo;
     }
@@ -108,12 +108,14 @@
             type="date" value-format="yyyy-MM-dd" placeholder="选择订单创建时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="车子类型" prop="garOrderCarType">
-          <el-input :disabled="true" v-model="form.garOrderCarType" placeholder="请输入车子类型" />
-        </el-form-item>
-        <el-form-item label="车子数量" prop="garOrderCarNumber">
-          <el-input :disabled="true" v-model="form.garOrderCarNumber" placeholder="请输入车子数量" />
-        </el-form-item>
+        <div v-for="(carItem,index) in form.orderCarStatistics" :key="index">
+          <el-form-item label="车子类型" prop="garOrderCarType" >
+            <el-input :disabled="true" v-model="carItem.carType" placeholder="请输入车子类型" />
+          </el-form-item>
+          <el-form-item label="车子数量" prop="garOrderCarNumber">
+            <el-input :disabled="true" v-model="carItem.number" placeholder="请输入车子数量" />
+          </el-form-item>
+      </div>
         <el-form-item label="备注" prop="garRemark">
           <el-input :disabled="true" v-model="form.garRemark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -130,12 +132,15 @@
           <div class="handle-box-title-text" style="color: #409EFF; font-size: 25px;">派单处理信息</div>
         </div>
         <el-form :inline="true" :model="form">
-          <el-form-item label="派单负责人" prop="garOrderHandler">
-            <el-input v-model="form.garOrderHandleName" placeholder="派单负责人" />
-          </el-form-item>
-          <el-form-item label="派单负责人电话" prop="garOrderHandlerTel">
-            <el-input v-model="form.garOrderHandleTel" placeholder="派单负责人电话" />
-          </el-form-item>
+          <div v-for="(orderDriver,index) in form.orderDrivers" :key="index">
+            <el-form-item label="派单负责人" prop="garOrderHandler">
+              <el-input v-model="orderDriver.driverName" placeholder="派单负责人" />
+            </el-form-item>
+            <el-form-item label="派单负责人电话" prop="garOrderHandlerTel">
+              <el-input v-model="orderDriver.driverPhone" placeholder="派单负责人电话" />
+            </el-form-item>
+          </div>
+          
           <el-form-item v-if="form.putOnImages" label="现场图片" prop="putOnImages">
             <el-image style="width: 100px; height: 100px" :src="form.putOnImages[0]" :preview-src-list="form.putOnImages">
             </el-image>
@@ -312,6 +317,9 @@ export default {
       const garOrderId = row.garOrderId || this.ids
       getOrder(garOrderId).then(response => {
         this.form = response.data;
+        console.log(this.form);
+        console.log("----------------------->");
+        
         this.form.currentImages = this.form.currentImages.map(map => process.env.VUE_APP_BASE_API + map)
         this.form.putDownImages = this.form.putDownImages.map(map => process.env.VUE_APP_BASE_API + map)
         this.form.putOnImages = this.form.putOnImages.map(map => process.env.VUE_APP_BASE_API + map)