新增运距,用户跟车

lichao
1 parent 758c7474
Showing 18 changed files with 108 additions and 7 deletions
trash-admin/src/main/resources/application-dev.yml
trash-garbage/src/main/java/com/trash/garbage/controller/GarOrderMatchAskController.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrder.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchAsk.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/AskTransportDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/GarOrderDisposalVo.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/ScanDriverDetailVo.java
trash-garbage/src/main/java/com/trash/garbage/service/GarCarServer.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchAskServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
trash-garbage/src/main/resources/mapper/GarOrderMatchAskMapper.xml
trash-ui/src/views/ask/ask/index.vue
trash-ui/src/views/index.vue
@@ -89,7 +89,7 @@ spring:
         # 端口，默认为6379
         port: 6379
         # 密码
-        password: 
+        password: bsth123
         # 连接超时时间
         timeout: 10s
         database: 10
@@ -8,6 +8,7 @@ import com.trash.common.enums.BusinessType;
 import com.trash.common.utils.poi.ExcelUtil;
 import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
 import com.trash.garbage.service.GarOrderMatchAskService;
+import com.trash.garbage.service.impl.GarOrderServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -42,6 +42,8 @@ public interface GarOrderMapper extends BaseMapper&lt;GarOrder&gt; {
     String queryCompanyIdByPhone(@Param("phone")String phone);
     List<DockingQRCodeEntity> queryReportByCarCode(@Param("carCode") String carCode,@Param("dateStr") String dateStr);
+
+    int queryGarRealCarCountByGarOrderId(@Param("garOrderId") String garOrderId);
 }
@@ -171,6 +171,8 @@ public class GarOrder implements Serializable {
     private Boolean garInCarStore;
+    private Boolean needFollowCar;
+
     /**
      * 评分标识
      */
@@ -151,6 +151,10 @@ public class GarOrderMatchAsk implements Serializable {
     @Excel(name = "趟次类型",readConverterExp = "0=正常趟次,1=异常趟次")
     private String garOrderType;
+
+    //运输距离
+    @Excel(name = "运距")
+    private String transportDistance;
     /**
      * 备注
      */
@@ -214,6 +218,8 @@ public class GarOrderMatchAsk implements Serializable {
      */
     private String unloadingLonLat;
+
+
     public Date getUpdateTime() {
         return updateTime;
     }
@@ -472,4 +478,12 @@ public class GarOrderMatchAsk implements Serializable {
     public void setDisposalSiteName(String disposalSiteName) {
         this.disposalSiteName = disposalSiteName;
     }
+
+    public void setTransportDistance(String transportDistance) {
+        this.transportDistance = transportDistance;
+    }
+
+    public String getTransportDistance() {
+        return transportDistance;
+    }
 }
 \ No newline at end of file
@@ -42,6 +42,8 @@ public class AskTransportDto {
     // 经度
     private double longitude;
+    private String transportDistance;
+
     public double getLatitude() {
         return latitude;
     }
@@ -153,4 +155,12 @@ public class AskTransportDto {
     public void setGarOrderContainerVolume(String garOrderContainerVolume) {
         this.garOrderContainerVolume = garOrderContainerVolume;
     }
+
+    public void setTransportDistance(String transportDistance) {
+        this.transportDistance = transportDistance;
+    }
+
+    public String getTransportDistance() {
+        return transportDistance;
+    }
 }
@@ -76,6 +76,8 @@ public class OrderDto {
     private Boolean garInCarStore;
+    private Boolean needFollowCar;
+
     /**
@@ -93,6 +95,13 @@ public class OrderDto {
     private String garAskStatus;
+    public void setNeedFollowCar(Boolean needFollowCar) {
+        this.needFollowCar = needFollowCar;
+    }
+    public Boolean getNeedFollowCar() {
+        return needFollowCar;
+    }
+
     @ToString
     @EqualsAndHashCode
     public static class CarInfo {
@@ -305,6 +314,7 @@ public class OrderDto {
                 ", garOrderCompanyName='" + garOrderCompanyName + '\'' +
                 ", garOrderCompanyTel='" + garOrderCompanyTel + '\'' +
                 ", garInCarStore=" + garInCarStore +
+                ", needFollowCar='" + needFollowCar + '\'' +
                 ", garOrderAgreementTime='" + garOrderAgreementTime + '\'' +
                 ", garRemark='" + garRemark + '\'' +
                 ", garCarInfoList=" + garCarInfoList +
@@ -20,6 +20,12 @@ public class GarOrderDisposalVo extends GarOrder {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date garCreateTime;
+//    public void adjustCarCount() {
+//        if (garNowCarCount != null && super.getGarRealCarCount() != null && garNowCarCount > super.getGarRealCarCount()) {
+//            garNowCarCount = super.getGarRealCarCount();
+//        }
+//    }
+
     @Override
     public Date getGarCreateTime() {
         return garCreateTime;
@@ -156,6 +156,8 @@ public class OrderDetailVo {
     private Integer garOrderStatus;
     private String garHandlerCarCode;
+
+    private Boolean needFollowCar;
     /**
      * 是否有用户的评价，默认值是0，默认没有
      *
@@ -501,4 +503,12 @@ public class OrderDetailVo {
     public void setOrderDisposalCompanyReports(Collection<OrderDisposalCompanyReport> orderDisposalCompanyReports) {
         this.orderDisposalCompanyReports = orderDisposalCompanyReports;
     }
+
+    public void setNeedFollowCar(Boolean needFollowCar) {
+        this.needFollowCar = needFollowCar;
+    }
+
+    public Boolean getNeedFollowCar() {
+        return needFollowCar;
+    }
 }
@@ -15,6 +15,9 @@ public class ScanDriverDetailVo extends GarOrder {
     private String garHandlerCarCode;
     private String garOrderHandlerId;
     private String garOrderContainerVolume;
+    private String garOrderContainerType;
+    private String garLatitude;
+    private String garLongitude;
     public String getGarOrderContainerVolume() {
         return garOrderContainerVolume;
@@ -57,4 +60,15 @@ public class ScanDriverDetailVo extends GarOrder {
     }
+    public void setGarLongitude(String garLongitude) {
+        this.garLongitude = garLongitude;
+    }
+
+    public void setGarLatitude(String garLatitude) {
+        this.garLatitude = garLatitude;
+    }
+
+    public void setGarOrderContainerType(String garOrderContainerType) {
+        this.garOrderContainerType = garOrderContainerType;
+    }
 }
@@ -11,5 +11,4 @@ public interface GarCarServer {
     List<GarCarInfoVo> requestGarCarInfoVo(String companId);
     List<DispatchDriverVo> requestDispatchDriverVo(String companId);
-
 }
@@ -109,4 +109,7 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
     String queryCarIdOfDriver(String  phone);
     List<DockingQRCodeEntity>queryReportByCarCode(String carCode);
+
+    Integer queryGarRealCarCountByGarOrderId(String garOrderId);
+
 }
@@ -2,9 +2,12 @@ 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.GarOrderMapper;
 import com.trash.garbage.mapper.GarOrderMatchAskMapper;
 import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
+import com.trash.garbage.pojo.vo.OrderDetailTransportVo;
 import com.trash.garbage.service.GarOrderMatchAskService;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,6 +24,9 @@ public class GarOrderMatchAskServiceImpl extends ServiceImpl&lt;GarOrderMatchAskMap
     @Autowired
     GarOrderMatchAskMapper garOrderMatchAskMapper;
+    @Autowired
+    private GarOrderMapper garOrderMapper;
+
     @Override
     public List<GarOrderMatchAsk> queryByOrderId(String orderId) {
@@ -62,7 +68,16 @@ public class GarOrderMatchAskServiceImpl extends ServiceImpl&lt;GarOrderMatchAskMap
     @Override
     public int insertGarOrderMatchAsk(GarOrderMatchAsk garOrderMatchAsk)
     {
-        return garOrderMatchAskMapper.insertGarOrderMatchAsk(garOrderMatchAsk);
+        int garRealCarCount = garOrderMapper.queryGarRealCarCountByGarOrderId(garOrderMatchAsk.getGarOrderId());
+        OrderDetailTransportVo orderDetailTransportVo = garOrderMapper.queryOrderTransportDetail(garOrderMatchAsk.getGarOrderId());
+        List<OrderDetailTransportVo.TransportDetail> transportDetails = orderDetailTransportVo.getTransportDetails();
+
+        int size = transportDetails.size();
+        if (size < garRealCarCount){
+            return garOrderMatchAskMapper.insertGarOrderMatchAsk(garOrderMatchAsk);
+        }else {
+            return 1;
+        }
     }
     /**
@@ -398,6 +398,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             if (GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
                     || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
                 List<GarOrderDisposalVo> orderList = baseMapper.queryDisposalOrderListByTelWithType(user.getGarUserTel(), type, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
+//                orderList.forEach(GarOrderDisposalVo::adjustCarCount);
                 PageInfo<GarOrderDisposalVo> pageInfo = new PageInfo<GarOrderDisposalVo>(orderList, pageSize);
                 return pageInfo;
             }
@@ -1468,7 +1469,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 BeanUtils.copyProperties(dto, garOrderMatchAsk);
                 garOrderMatchAsk.setGarUpdateBy(dto.getGarOrderHandlerName());
                 garOrderMatchAsk.setGarUpdateTime(new Date());
-
+                garOrderMatchAsk.setTransportDistance(dto.getTransportDistance());
                 // 判断本趟次是否上传了图片
                 if(garOrderMatchAsk.getGarCarCode()==null){
                     garOrderMatchAsk.setGarOrderType("1");
@@ -1521,6 +1522,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     public OrderDetailTransportVo queryOrderTransportDetail(String id) {
         // 根据当前订单id查订单数据 - 查扫码趟次数据
         OrderDetailTransportVo vo = baseMapper.queryOrderTransportDetail(id);
+        vo.getGarRealCarCount();
+        List<OrderDetailTransportVo.TransportDetail> transportDetails = vo.getTransportDetails();
+
+
         vo.setCurrentImages(new ArrayList<>());
         // 全景图片
         LambdaQueryWrapper<GarOrderImage> qw = new LambdaQueryWrapper<>();
@@ -1706,6 +1711,11 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         return baseMapper.queryReportByCarCode(carCode, dateStr);
     }
+    @Override
+    public Integer queryGarRealCarCountByGarOrderId(String garOrderId) {
+        return baseMapper.queryGarRealCarCountByGarOrderId(garOrderId);
+    }
+
     private void handleCleanNumber(TransportationEnterpriseVo vo, List<GarOrder> orderList) {
         Long cleanNumber = 0L;
@@ -118,7 +118,7 @@
         `order`.gar_order_id ,`order`.gar_order_user_id,`order`.gar_latitude,
         `order`.gar_order_address,`order`.gar_order_address_details,`order`.gar_order_contact_name,`order`.gar_longitude,
         `order`.gar_order_trash_type,`order`.gar_order_contact_tel,`order`.gar_order_company_id,`order`.gar_coordinate,
-        `order`.gar_order_company_name,`order`.gar_order_company_tel,`order`.gar_order_scan_handler_flag,`order`.gar_real_car_count,
+        `order`.gar_order_company_name,`order`.gar_order_company_tel,`order`.gar_order_scan_handler_flag,`order`.gar_real_car_count,`order`.need_follow_car,
         `order`.gar_order_agreement_time,`order`.gar_remark,`order`.gar_handler_evaluate_flag,
         `handler`.gar_order_handler_status,`handler`.gar_cancel_flag,`handler`.gar_reason,`handler`.gar_handler_car_code
         FROM gar_order `order`
@@ -272,4 +272,7 @@
         and (go2.gar_create_time <![CDATA[ >= ]]>#{dateStr}  or go2.gar_order_handler_status in(0,1))
         order by go2.gar_create_time desc
     </select>
+    <select id="queryGarRealCarCountByGarOrderId" resultType="java.lang.Integer">
+        select gar_real_car_count from gar_order where gar_order_id=#{garOrderId}
+    </select>
 </mapper>
@@ -58,11 +58,12 @@
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="garOrderTime"    column="gar_order_time"    />
+        <result property="transportDistance"    column="transport_distance"    />
     </resultMap>
     <sql id="selectGarOrderMatchAskVo">
-        select gar_id,gar_order_id,gar_order_handler_tel,gar_order_handler_name,gar_order_container_volume,gar_order_handler_id,gar_handler_car_code,gar_order_handler_company_id,gar_order_handler_company_name,gar_create_time,gar_update_time,gar_create_by,gar_update_by,gar_remark,gar_carrying_weight,drop_point_id,drop_point_name,gar_order_type,disposal_id,disposal_site_name,gar_order_number,gar_order_phone,gar_order_name,drop_custodian_phone,drop_address,drop_car_num,gar_car_code,create_time,create_by,update_time,update_by,gar_order_time from gar_order_match_ask
+        select gar_id,gar_order_id,gar_order_handler_tel,gar_order_handler_name,gar_order_container_volume,gar_order_handler_id,gar_handler_car_code,gar_order_handler_company_id,gar_order_handler_company_name,gar_create_time,gar_update_time,gar_create_by,gar_update_by,gar_remark,gar_carrying_weight,drop_point_id,drop_point_name,gar_order_type,disposal_id,disposal_site_name,gar_order_number,gar_order_phone,gar_order_name,drop_custodian_phone,drop_address,drop_car_num,gar_car_code,create_time,create_by,update_time,update_by,gar_order_time,transport_distance from gar_order_match_ask
     </sql>
     <select id="selectGarOrderMatchAskList" parameterType="GarOrderMatchAsk" resultMap="GarOrderMatchAskResult">
@@ -125,6 +125,7 @@
           <span v-if="scope.row.garOrderType == 1">异常趟次</span>
         </template>
       </el-table-column>
+      <el-table-column label="运距" align="center" prop="transportDistance"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
 <template>
   <div class="dashboard-editor-container">
-<!-- 
+<!--
     <panel-group @handleSetLineChartData="handleSetLineChartData" />
     <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">