youxiw2000 / trash · Commits

Commit 111dae4cfe10d1534cd43574da3b2c35bf644c63

Authored by lichao
1 parent 758c7474
build: skipped

新增运距,用户跟车

Inline Side-by-side
Showing 18 changed files with 108 additions and 7 deletions
trash-admin/src/main/resources/application-dev.yml
  View file @111dae4
... ... @@ -89,7 +89,7 @@ spring:
89 89 # 端口，默认为6379
90 90 port: 6379
91 91 # 密码
92   - password:
  92 + password: bsth123
93 93 # 连接超时时间
94 94 timeout: 10s
95 95 database: 10
... ...
trash-garbage/src/main/java/com/trash/garbage/controller/GarOrderMatchAskController.java
  View file @111dae4
... ... @@ -8,6 +8,7 @@ import com.trash.common.enums.BusinessType;
8 8 import com.trash.common.utils.poi.ExcelUtil;
9 9 import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
10 10 import com.trash.garbage.service.GarOrderMatchAskService;
  11 +import com.trash.garbage.service.impl.GarOrderServiceImpl;
11 12 import org.springframework.beans.factory.annotation.Autowired;
12 13 import org.springframework.security.access.prepost.PreAuthorize;
13 14 import org.springframework.web.bind.annotation.*;
... ...
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMapper.java
  View file @111dae4
... ... @@ -42,6 +42,8 @@ public interface GarOrderMapper extends BaseMapper<GarOrder> {
42 42 String queryCompanyIdByPhone(@Param("phone")String phone);
43 43  
44 44 List<DockingQRCodeEntity> queryReportByCarCode(@Param("carCode") String carCode,@Param("dateStr") String dateStr);
  45 +
  46 + int queryGarRealCarCountByGarOrderId(@Param("garOrderId") String garOrderId);
45 47 }
46 48  
47 49  
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrder.java
  View file @111dae4
... ... @@ -171,6 +171,8 @@ public class GarOrder implements Serializable {
171 171  
172 172 private Boolean garInCarStore;
173 173  
  174 + private Boolean needFollowCar;
  175 +
174 176 /**
175 177 * 评分标识
176 178 */
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchAsk.java
  View file @111dae4
... ... @@ -151,6 +151,10 @@ public class GarOrderMatchAsk implements Serializable {
151 151 @Excel(name = "趟次类型",readConverterExp = "0=正常趟次,1=异常趟次")
152 152 private String garOrderType;
153 153  
  154 +
  155 + //运输距离
  156 + @Excel(name = "运距")
  157 + private String transportDistance;
154 158 /**
155 159 * 备注
156 160 */
... ... @@ -214,6 +218,8 @@ public class GarOrderMatchAsk implements Serializable {
214 218 */
215 219 private String unloadingLonLat;
216 220  
  221 +
  222 +
217 223 public Date getUpdateTime() {
218 224 return updateTime;
219 225 }
... ... @@ -472,4 +478,12 @@ public class GarOrderMatchAsk implements Serializable {
472 478 public void setDisposalSiteName(String disposalSiteName) {
473 479 this.disposalSiteName = disposalSiteName;
474 480 }
  481 +
  482 + public void setTransportDistance(String transportDistance) {
  483 + this.transportDistance = transportDistance;
  484 + }
  485 +
  486 + public String getTransportDistance() {
  487 + return transportDistance;
  488 + }
475 489 }
476 490 \ No newline at end of file
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/AskTransportDto.java
  View file @111dae4
... ... @@ -42,6 +42,8 @@ public class AskTransportDto {
42 42 // 经度
43 43 private double longitude;
44 44  
  45 + private String transportDistance;
  46 +
45 47 public double getLatitude() {
46 48 return latitude;
47 49 }
... ... @@ -153,4 +155,12 @@ public class AskTransportDto {
153 155 public void setGarOrderContainerVolume(String garOrderContainerVolume) {
154 156 this.garOrderContainerVolume = garOrderContainerVolume;
155 157 }
  158 +
  159 + public void setTransportDistance(String transportDistance) {
  160 + this.transportDistance = transportDistance;
  161 + }
  162 +
  163 + public String getTransportDistance() {
  164 + return transportDistance;
  165 + }
156 166 }
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderDto.java
  View file @111dae4
... ... @@ -76,6 +76,8 @@ public class OrderDto {
76 76  
77 77 private Boolean garInCarStore;
78 78  
  79 + private Boolean needFollowCar;
  80 +
79 81  
80 82  
81 83 /**
... ... @@ -93,6 +95,13 @@ public class OrderDto {
93 95  
94 96 private String garAskStatus;
95 97  
  98 + public void setNeedFollowCar(Boolean needFollowCar) {
  99 + this.needFollowCar = needFollowCar;
  100 + }
  101 + public Boolean getNeedFollowCar() {
  102 + return needFollowCar;
  103 + }
  104 +
96 105 @ToString
97 106 @EqualsAndHashCode
98 107 public static class CarInfo {
... ... @@ -305,6 +314,7 @@ public class OrderDto {
305 314 ", garOrderCompanyName='" + garOrderCompanyName + '\'' +
306 315 ", garOrderCompanyTel='" + garOrderCompanyTel + '\'' +
307 316 ", garInCarStore=" + garInCarStore +
  317 + ", needFollowCar='" + needFollowCar + '\'' +
308 318 ", garOrderAgreementTime='" + garOrderAgreementTime + '\'' +
309 319 ", garRemark='" + garRemark + '\'' +
310 320 ", garCarInfoList=" + garCarInfoList +
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/GarOrderDisposalVo.java
  View file @111dae4
... ... @@ -20,6 +20,12 @@ public class GarOrderDisposalVo extends GarOrder {
20 20 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
21 21 private Date garCreateTime;
22 22  
  23 +// public void adjustCarCount() {
  24 +// if (garNowCarCount != null && super.getGarRealCarCount() != null && garNowCarCount > super.getGarRealCarCount()) {
  25 +// garNowCarCount = super.getGarRealCarCount();
  26 +// }
  27 +// }
  28 +
23 29 @Override
24 30 public Date getGarCreateTime() {
25 31 return garCreateTime;
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
  View file @111dae4
... ... @@ -156,6 +156,8 @@ public class OrderDetailVo {
156 156 private Integer garOrderStatus;
157 157  
158 158 private String garHandlerCarCode;
  159 +
  160 + private Boolean needFollowCar;
159 161 /**
160 162 * 是否有用户的评价，默认值是0，默认没有
161 163 *
... ... @@ -501,4 +503,12 @@ public class OrderDetailVo {
501 503 public void setOrderDisposalCompanyReports(Collection<OrderDisposalCompanyReport> orderDisposalCompanyReports) {
502 504 this.orderDisposalCompanyReports = orderDisposalCompanyReports;
503 505 }
  506 +
  507 + public void setNeedFollowCar(Boolean needFollowCar) {
  508 + this.needFollowCar = needFollowCar;
  509 + }
  510 +
  511 + public Boolean getNeedFollowCar() {
  512 + return needFollowCar;
  513 + }
504 514 }
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/ScanDriverDetailVo.java
  View file @111dae4
... ... @@ -15,6 +15,9 @@ public class ScanDriverDetailVo extends GarOrder {
15 15 private String garHandlerCarCode;
16 16 private String garOrderHandlerId;
17 17 private String garOrderContainerVolume;
  18 + private String garOrderContainerType;
  19 + private String garLatitude;
  20 + private String garLongitude;
18 21  
19 22 public String getGarOrderContainerVolume() {
20 23 return garOrderContainerVolume;
... ... @@ -57,4 +60,15 @@ public class ScanDriverDetailVo extends GarOrder {
57 60 }
58 61  
59 62  
  63 + public void setGarLongitude(String garLongitude) {
  64 + this.garLongitude = garLongitude;
  65 + }
  66 +
  67 + public void setGarLatitude(String garLatitude) {
  68 + this.garLatitude = garLatitude;
  69 + }
  70 +
  71 + public void setGarOrderContainerType(String garOrderContainerType) {
  72 + this.garOrderContainerType = garOrderContainerType;
  73 + }
60 74 }
... ...
trash-garbage/src/main/java/com/trash/garbage/service/GarCarServer.java
  View file @111dae4
... ... @@ -11,5 +11,4 @@ public interface GarCarServer {
11 11 List<GarCarInfoVo> requestGarCarInfoVo(String companId);
12 12  
13 13 List<DispatchDriverVo> requestDispatchDriverVo(String companId);
14   -
15 14 }
... ...
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderService.java
  View file @111dae4
... ... @@ -109,4 +109,7 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
109 109 String queryCarIdOfDriver(String phone);
110 110  
111 111 List<DockingQRCodeEntity>queryReportByCarCode(String carCode);
  112 +
  113 + Integer queryGarRealCarCountByGarOrderId(String garOrderId);
  114 +
112 115 }
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchAskServiceImpl.java
  View file @111dae4
... ... @@ -2,9 +2,12 @@ package com.trash.garbage.service.impl;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  5 +import com.trash.garbage.mapper.GarOrderMapper;
5 6 import com.trash.garbage.mapper.GarOrderMatchAskMapper;
6 7 import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
  8 +import com.trash.garbage.pojo.vo.OrderDetailTransportVo;
7 9 import com.trash.garbage.service.GarOrderMatchAskService;
  10 +import org.apache.ibatis.annotations.Param;
8 11 import org.springframework.beans.factory.annotation.Autowired;
9 12 import org.springframework.stereotype.Service;
10 13  
... ... @@ -21,6 +24,9 @@ public class GarOrderMatchAskServiceImpl extends ServiceImpl&lt;GarOrderMatchAskMap
21 24  
22 25 @Autowired
23 26 GarOrderMatchAskMapper garOrderMatchAskMapper;
  27 + @Autowired
  28 + private GarOrderMapper garOrderMapper;
  29 +
24 30  
25 31 @Override
26 32 public List<GarOrderMatchAsk> queryByOrderId(String orderId) {
... ... @@ -62,7 +68,16 @@ public class GarOrderMatchAskServiceImpl extends ServiceImpl&lt;GarOrderMatchAskMap
62 68 @Override
63 69 public int insertGarOrderMatchAsk(GarOrderMatchAsk garOrderMatchAsk)
64 70 {
65   - return garOrderMatchAskMapper.insertGarOrderMatchAsk(garOrderMatchAsk);
  71 + int garRealCarCount = garOrderMapper.queryGarRealCarCountByGarOrderId(garOrderMatchAsk.getGarOrderId());
  72 + OrderDetailTransportVo orderDetailTransportVo = garOrderMapper.queryOrderTransportDetail(garOrderMatchAsk.getGarOrderId());
  73 + List<OrderDetailTransportVo.TransportDetail> transportDetails = orderDetailTransportVo.getTransportDetails();
  74 +
  75 + int size = transportDetails.size();
  76 + if (size < garRealCarCount){
  77 + return garOrderMatchAskMapper.insertGarOrderMatchAsk(garOrderMatchAsk);
  78 + }else {
  79 + return 1;
  80 + }
66 81 }
67 82  
68 83 /**
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
  View file @111dae4
... ... @@ -398,6 +398,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
398 398 if (GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
399 399 || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
400 400 List<GarOrderDisposalVo> orderList = baseMapper.queryDisposalOrderListByTelWithType(user.getGarUserTel(), type, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
  401 +// orderList.forEach(GarOrderDisposalVo::adjustCarCount);
401 402 PageInfo<GarOrderDisposalVo> pageInfo = new PageInfo<GarOrderDisposalVo>(orderList, pageSize);
402 403 return pageInfo;
403 404 }
... ... @@ -1468,7 +1469,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
1468 1469 BeanUtils.copyProperties(dto, garOrderMatchAsk);
1469 1470 garOrderMatchAsk.setGarUpdateBy(dto.getGarOrderHandlerName());
1470 1471 garOrderMatchAsk.setGarUpdateTime(new Date());
1471   -
  1472 + garOrderMatchAsk.setTransportDistance(dto.getTransportDistance());
1472 1473 // 判断本趟次是否上传了图片
1473 1474 if(garOrderMatchAsk.getGarCarCode()==null){
1474 1475 garOrderMatchAsk.setGarOrderType("1");
... ... @@ -1521,6 +1522,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
1521 1522 public OrderDetailTransportVo queryOrderTransportDetail(String id) {
1522 1523 // 根据当前订单id查订单数据 - 查扫码趟次数据
1523 1524 OrderDetailTransportVo vo = baseMapper.queryOrderTransportDetail(id);
  1525 + vo.getGarRealCarCount();
  1526 + List<OrderDetailTransportVo.TransportDetail> transportDetails = vo.getTransportDetails();
  1527 +
  1528 +
1524 1529 vo.setCurrentImages(new ArrayList<>());
1525 1530 // 全景图片
1526 1531 LambdaQueryWrapper<GarOrderImage> qw = new LambdaQueryWrapper<>();
... ... @@ -1706,6 +1711,11 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
1706 1711 return baseMapper.queryReportByCarCode(carCode, dateStr);
1707 1712 }
1708 1713  
  1714 + @Override
  1715 + public Integer queryGarRealCarCountByGarOrderId(String garOrderId) {
  1716 + return baseMapper.queryGarRealCarCountByGarOrderId(garOrderId);
  1717 + }
  1718 +
1709 1719  
1710 1720 private void handleCleanNumber(TransportationEnterpriseVo vo, List<GarOrder> orderList) {
1711 1721 Long cleanNumber = 0L;
... ...
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
  View file @111dae4
... ... @@ -118,7 +118,7 @@
118 118 `order`.gar_order_id ,`order`.gar_order_user_id,`order`.gar_latitude,
119 119 `order`.gar_order_address,`order`.gar_order_address_details,`order`.gar_order_contact_name,`order`.gar_longitude,
120 120 `order`.gar_order_trash_type,`order`.gar_order_contact_tel,`order`.gar_order_company_id,`order`.gar_coordinate,
121   - `order`.gar_order_company_name,`order`.gar_order_company_tel,`order`.gar_order_scan_handler_flag,`order`.gar_real_car_count,
  121 + `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,
122 122 `order`.gar_order_agreement_time,`order`.gar_remark,`order`.gar_handler_evaluate_flag,
123 123 `handler`.gar_order_handler_status,`handler`.gar_cancel_flag,`handler`.gar_reason,`handler`.gar_handler_car_code
124 124 FROM gar_order `order`
... ... @@ -272,4 +272,7 @@
272 272 and (go2.gar_create_time <![CDATA[ >= ]]>#{dateStr} or go2.gar_order_handler_status in(0,1))
273 273 order by go2.gar_create_time desc
274 274 </select>
  275 + <select id="queryGarRealCarCountByGarOrderId" resultType="java.lang.Integer">
  276 + select gar_real_car_count from gar_order where gar_order_id=#{garOrderId}
  277 + </select>
275 278 </mapper>
... ...
trash-garbage/src/main/resources/mapper/GarOrderMatchAskMapper.xml
  View file @111dae4
... ... @@ -58,11 +58,12 @@
58 58 <result property="createTime" column="create_time" />
59 59 <result property="updateTime" column="update_time" />
60 60 <result property="garOrderTime" column="gar_order_time" />
  61 + <result property="transportDistance" column="transport_distance" />
61 62  
62 63 </resultMap>
63 64  
64 65 <sql id="selectGarOrderMatchAskVo">
65   - 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
  66 + 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
66 67 </sql>
67 68  
68 69 <select id="selectGarOrderMatchAskList" parameterType="GarOrderMatchAsk" resultMap="GarOrderMatchAskResult">
... ...
trash-ui/src/views/ask/ask/index.vue
  View file @111dae4
... ... @@ -125,6 +125,7 @@
125 125 <span v-if="scope.row.garOrderType == 1">异常趟次</span>
126 126 </template>
127 127 </el-table-column>
  128 + <el-table-column label="运距" align="center" prop="transportDistance"/>
128 129 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
129 130 <template slot-scope="scope">
130 131 <el-button
... ...
trash-ui/src/views/index.vue
  View file @111dae4
1 1 <template>
2 2 <div class="dashboard-editor-container">
3   -<!--
  3 +<!--
4 4 <panel-group @handleSetLineChartData="handleSetLineChartData" />
5 5  
6 6 <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
... ...