根据公司展示车辆

liujun001
1 parent b5b4731b
Showing 13 changed files with 92 additions and 29 deletions
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMatchHandlerMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderCar.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderDto.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderCarService.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchHandlerService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderCarServiceImpl.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-garbage/src/main/resources/mapper/GarOrderMatchHandlerMapper.xml
trash-unit/src/main/java/com/trash/carInfo/mapper/CarInfoMapper.java
trash-unit/src/main/java/com/trash/carInfo/service/ICarInfoService.java
trash-unit/src/main/java/com/trash/carInfo/service/impl/CarInfoServiceImpl.java
trash-unit/src/main/resources/mapper/unit/CarInfoMapper.xml
@@ -7,6 +7,7 @@ import com.trash.garbage.pojo.vo.DispatchDriverVo;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
+import java.util.Set;
 /**
 * @author 20412
@@ -16,7 +17,7 @@ import java.util.List;
 */
 public interface GarOrderMatchHandlerMapper extends BaseMapper<GarOrderMatchHandler> {
-    List<DispatchDriverVo> queryDriverListWithDispatchStatus(@Param("orderId") String orderId, @Param("companyId") Long id);
+    List<DispatchDriverVo> queryDriverListWithDispatchStatus(@Param("orderId") String orderId, @Param("companyId") Long id,@Param("containerVolumees") Set<String> containerVolumees);
 }
 package com.trash.garbage.pojo.domain;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 /**
  * 订单车辆信息
@@ -57,6 +60,10 @@ public class GarOrderCar implements Serializable {
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private String garUpdateBy;
+    /**车辆ID*/
+    private Integer carId;
+    /**车辆容积*/
+    private String containerVolume;
     /**
      * 
@@ -66,6 +73,8 @@ public class GarOrderCar implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
+
+
     public String getGarId() {
         return garId;
     }
@@ -106,6 +106,8 @@ public class OrderDto {
         private Integer id;
         private String garOrderCarType;
+        private String containerVolume;
+
         public Integer getGarOrderCarNumber() {
             return garOrderCarNumber;
         }
@@ -141,8 +143,13 @@ public class OrderDto {
             this.id = id;
         }
+        public String getContainerVolume() {
+            return containerVolume;
+        }
-
+        public void setContainerVolume(String containerVolume) {
+            this.containerVolume = containerVolume;
+        }
     }
     public List<CarInfo> getGarCarInfoList() {
 package com.trash.garbage.service;
-import com.trash.garbage.pojo.domain.GarOrderCar;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.trash.garbage.pojo.domain.GarOrderCar;
+
+import java.util.List;
 /**
 * @author 20412
@@ -9,5 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
 * @createDate 2024-01-09 14:26:09
 */
 public interface GarOrderCarService extends IService<GarOrderCar> {
-
+    List<GarOrderCar> queryByOrderId(String orderId);
 }
 package com.trash.garbage.service;
-import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
 import com.trash.garbage.pojo.vo.DispatchDriverVo;
-import org.apache.ibatis.annotations.Param;
 import java.util.List;
+import java.util.Set;
 /**
 * @author 20412
@@ -14,5 +14,5 @@ import java.util.List;
 */
 public interface GarOrderMatchHandlerService extends IService<GarOrderMatchHandler> {
-    List<DispatchDriverVo> queryDriverListWithDispatchStatus(String orderId, Long companyId);
+    List<DispatchDriverVo> queryDriverListWithDispatchStatus(String orderId, Long companyId, Set<String> containerVolumees);
 }
 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.pojo.domain.GarOrderCar;
 import com.trash.garbage.service.GarOrderCarService;
 import com.trash.garbage.mapper.GarOrderCarMapper;
 import org.springframework.stereotype.Service;
+import java.util.List;
+
 /**
-* @author 20412
-* @description 针对表【gar_order_car(订单车辆信息)】的数据库操作Service实现
-* @createDate 2024-01-09 14:26:09
-*/
+ * @author 20412
+ * @description 针对表【gar_order_car(订单车辆信息)】的数据库操作Service实现
+ * @createDate 2024-01-09 14:26:09
+ */
 @Service
 public class GarOrderCarServiceImpl extends ServiceImpl<GarOrderCarMapper, GarOrderCar>
-    implements GarOrderCarService{
+        implements GarOrderCarService {
+    @Override
+    public List<GarOrderCar> queryByOrderId(String orderId) {
+        LambdaQueryWrapper<GarOrderCar> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(GarOrderCar::getGarOrderId, orderId);
+        return list(wrapper);
+    }
 }
@@ -8,6 +8,7 @@ import com.trash.garbage.service.GarOrderMatchHandlerService;
 import org.springframework.stereotype.Service;
 import java.util.List;
+import java.util.Set;
 /**
  * @author 20412
@@ -19,8 +20,8 @@ public class GarOrderMatchHandlerServiceImpl extends ServiceImpl&lt;GarOrderMatchHa
         implements GarOrderMatchHandlerService {
     @Override
-    public List<DispatchDriverVo> queryDriverListWithDispatchStatus(String orderId, Long id) {
-        return baseMapper.queryDriverListWithDispatchStatus(orderId, id);
+    public List<DispatchDriverVo> queryDriverListWithDispatchStatus(String orderId, Long id, Set<String> containerVolumees) {
+        return baseMapper.queryDriverListWithDispatchStatus(orderId, id,containerVolumees);
     }
 }
@@ -106,6 +106,8 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 GarOrderCar car = new GarOrderCar();
                 car.setGarOrderCarType(carInfo.getGarOrderCarType());
                 car.setGarOrderId(order.getGarOrderId());
+                car.setCarId(carInfo.getId());
+                car.setContainerVolume(carInfo.getContainerVolume());
                 car.setGarOrderCarUserType(GlobalStatus.GarOrderStatus.PLAN_CAR_TYPE.getValue());
                 garOrderCars.add(car);
             }
@@ -486,6 +488,8 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                     GarOrderCar car = new GarOrderCar();
                     car.setGarOrderCarType(carInfo.getGarOrderCarType());
                     car.setGarOrderId(dto.getGarOrderId());
+                    car.setContainerVolume(carInfo.getContainerVolume());
+                    car.setCarId(carInfo.getId());
                     car.setGarOrderCarUserType(GlobalStatus.GarOrderStatus.REAL_CAR_TYPE.getValue());
                     garOrderCars.add(car);
                 }
@@ -817,8 +821,18 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         TransportationEnterprise enterprise = new TransportationEnterprise();
         enterprise.setServicePhone(tel);
         List<TransportationEnterprise> enterprises = transportationEnterpriseService.selectTransportationEnterpriseList(enterprise);
+        if(CollectionUtils.isEmpty(enterprises)){
+            return Collections.emptyList();
+        }
+
+       List<GarOrderCar> garOrderCars = garOrderCarService.queryByOrderId(orderId);
+        if(CollectionUtils.isEmpty(garOrderCars)){
+            return Collections.emptyList();
+        }
+
+        Set<String> containerVolumees = garOrderCars.stream().map(GarOrderCar::getContainerVolume).collect(Collectors.toSet());
         // 选中的司机
-        List<DispatchDriverVo> voList = handlerService.queryDriverListWithDispatchStatus(orderId, enterprises.get(0).getId());
+        List<DispatchDriverVo> voList = handlerService.queryDriverListWithDispatchStatus(orderId, enterprises.get(0).getId(),containerVolumees);
         return voList;
     }
@@ -58,6 +58,9 @@
                 LEFT JOIN gar_order_match_handler gar ON gar.gar_order_handler_tel = driver.phoneNo
                 AND gar.gar_order_id = #{orderId} AND gar.gar_handler_car_code = car.car_code
         WHERE
-            driver.company_id = #{companyId}
+            driver.company_id = #{companyId} and container_volume in
+            <foreach collection="containerVolumees" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
     </select>
 </mapper>
 package com.trash.carInfo.mapper;
-import java.util.List;
-
 import com.trash.carInfo.domain.CarDriverRelation;
 import com.trash.carInfo.domain.CarInfo;
 import com.trash.carInfo.domain.vo.CarInfoVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 /**
  * 运输车辆管理Mapper接口
@@ -30,6 +31,8 @@ public interface CarInfoMapper
      */
     List<CarInfoVo> selectCarInfoList(CarInfoVo carInfo);
+    List<CarInfoVo> selectByCompanyId(@Param("companyId") Long companyId);
+
     /**
      * 新增运输车辆管理
      * 
 package com.trash.carInfo.service;
-import java.io.IOException;
-import java.util.List;
 import com.trash.carInfo.domain.CarInfo;
 import com.trash.carInfo.domain.vo.CarInfoVo;
 import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import java.util.List;
+
 /**
  * 运输车辆管理Service接口
  * 
@@ -30,6 +31,8 @@ public interface ICarInfoService
      */
     List<CarInfoVo> selectCarInfoList(CarInfoVo carInfo);
+    List<CarInfoVo> selectByCompanyId(Long companyId);
+
     /**
      * 新增运输车辆管理
      *
 package com.trash.carInfo.service.impl;
-import java.io.IOException;
-import java.util.List;
-
 import com.trash.carInfo.domain.CarDriverRelation;
+import com.trash.carInfo.domain.CarInfo;
 import com.trash.carInfo.domain.vo.CarInfoVo;
+import com.trash.carInfo.mapper.CarInfoMapper;
+import com.trash.carInfo.service.ICarInfoService;
 import com.trash.common.config.trashConfig;
 import com.trash.common.utils.DateUtils;
 import com.trash.common.utils.SecurityUtils;
-import com.trash.enterprise.domain.TransportationEnterprise;
 import com.trash.enterprise.mapper.TransportationEnterpriseMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.trash.carInfo.mapper.CarInfoMapper;
-import com.trash.carInfo.domain.CarInfo;
-import com.trash.carInfo.service.ICarInfoService;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import java.util.List;
+
 import static com.trash.common.utils.file.FileUploadUtils.upload;
 /**
@@ -59,6 +58,11 @@ public class CarInfoServiceImpl implements ICarInfoService
         return carInfoMapper.selectCarInfoList(carInfo);
     }
+    @Override
+    public List<CarInfoVo> selectByCompanyId(Long companyId) {
+        return carInfoMapper.selectByCompanyId(companyId);
+    }
+
     /**
      * 新增运输车辆管理
      *
@@ -149,6 +149,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <include refid="selectCarInfoVo"/>
         where id = #{id}
     </select>
+    
+    
+    <select id="selectByCompanyId" parameterType="Long" resultMap="CarInfoVoResult">
+        <include refid="selectCarInfoForCompanyVo"/>
+        where car.company_id=#{companyId}
+    </select>
+    
     <insert id="insertCarInfo" parameterType="CarInfo" useGeneratedKeys="true" keyProperty="id">
         insert into car_info