Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-report/src/main/java/com/sckw/report/controller/KwTransportController.java

@@ -165,16 +165,14 @@ public class KwTransportController {
      * @param query
      * @return
      */
-    @RequestMapping(value = "/getWaybillOrders", method = RequestMethod.GET)
-    public HttpResult getWayBillOrders(WaybillOrderQuery query){
-        HttpResult httpResult = new HttpResult();
+    @RequestMapping(value = "/getWaybillOrders", method = RequestMethod.POST)
+    public HttpResult getWayBillOrders(@Validated @RequestBody WaybillOrderQuery query){
         try {
-            httpResult = transportService.getWaybillOrders(query);
+            return transportService.getWaybillOrders(query);
         } catch (Exception e) {
             log.error("[WAYBILL]运单管理-运单列表失败:{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
         }
-        return httpResult;
     }
 
     /**
@@ -185,8 +183,8 @@ public class KwTransportController {
      * @author jc
      * @date 2023/07/21
      */
-    @RequestMapping(value = "/getWayBillStatistics", method = RequestMethod.GET)
-    public HttpResult wayBillStatistics(WaybillOrderQuery query) {
+    @RequestMapping(value = "/getWayBillStatistics", method = RequestMethod.POST)
+    public HttpResult wayBillStatistics(@Validated @RequestBody WaybillOrderQuery query) {
         try {
             return transportService.getWayBillStatistics(query);
         } catch (Exception e) {

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwTransportService.java

@@ -328,12 +328,21 @@ public class KwTransportService {
             CarWaybillVo vo = new CarWaybillVo();
             vo.setWOrderNo(waybillOrder.getWOrderNo() == null ?
                     null : String.valueOf(waybillOrder.getWOrderNo()));
+            vo.setWOrderId(waybillOrder.getWOrderId() == null ?
+                    null : String.valueOf(waybillOrder.getWOrderId()));
             vo.setFirmName(waybillOrder.getFirmName() == null ?
                     null : String.valueOf(waybillOrder.getFirmName()));
             vo.setTruckNo(waybillOrder.getTruckNo());
             vo.setDriverName(waybillOrder.getDriverName() == null ?
                     null : String.valueOf(waybillOrder.getDriverName()));
-            vo.setType(String.valueOf(waybillOrder.getType()));
+            String typeString = "";
+            if (waybillOrder.getType().equals(NumberConstant.ONE)) {
+                typeString = "趟次";
+            }
+            if (waybillOrder.getType().equals(NumberConstant.TWO)) {
+                typeString = "循环";
+            }
+            vo.setType(typeString);
             vo.setSendCarTime(waybillOrder.getCreateTime() == null ?
                     null : DateUtil.getDateTime(waybillOrder.getCreateTime()));
             vo.setStartTime(waybillOrder.getStartTime() == null ?

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/WaybillOrderDTO.java

@@ -63,12 +63,12 @@ public class WaybillOrderDTO extends PageRequest implements Serializable {
     /**
      * 装载城市
      */
-    private String loadCityName;
+    private Integer loadCityCode;
 
     /**
      * 卸载城市
      */
-    private String unloadCityName;
+    private Integer unloadCityCode;
 
     /**
      * 运单状态

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/WaybillManagementService.java

@@ -2,10 +2,12 @@ package com.sckw.transport.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sckw.core.common.enums.NumberConstant;
+import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.model.enums.CarWaybillEnum;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.utils.FileUtils;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
@@ -15,6 +17,7 @@ import com.sckw.fleet.api.model.vo.RTruckVo;
 import com.sckw.mongo.model.SckwWaybillOrder;
 import com.sckw.mongo.model.TableTops;
 import com.sckw.system.api.RemoteSystemService;
+import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import com.sckw.transport.dao.*;
 import com.sckw.transport.model.KwtLogisticsOrder;
@@ -24,7 +27,6 @@ import com.sckw.transport.model.dto.WaybillOrderDTO;
 import com.sckw.transport.model.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
@@ -108,20 +110,24 @@ public class WaybillManagementService {
             wayBillDetailDTO.setGoodsName(info.getGoodsName());
             wayBillDetailDTO.setLoadDetailAddress(info.getLoadDetailAddress());
             wayBillDetailDTO.setUnloadDetailAddress(info.getUnloadDetailAddress());
+            // 计价方式
             KwtLogisticsOrder kwtLogisticsOrder = kwtLogisticsOrderMapper.selectById(info.getLOrderId());
-            wayBillDetailDTO.setPriceType(kwtLogisticsOrder.getBillingMode());
+            if(!ObjectUtils.isEmpty(kwtLogisticsOrder)) {
+                SysDictResDto billingMode = remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.CHARGING_TYPE.getType(), kwtLogisticsOrder.getBillingMode());
+                if(!ObjectUtils.isEmpty(billingMode)) {
+                    wayBillDetailDTO.setPriceType(billingMode.getLabel());
+                }
+            }
             wayBillDetailDTO.setCheckFirmName(info.getCheckFirmName());
             // 车辆信息
-            waybillCarVO.setType(info.getTruckType());
+            SysDictResDto truckTypeString = remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.TRUCK_TYPE.getType(), info.getTruckType());
+            if(!ObjectUtils.isEmpty(truckTypeString)) {
+                waybillCarVO.setType(truckTypeString.getLabel());
+            }
             waybillCarVO.setTruckNo(info.getTruckNo());
             waybillCarVO.setDriverName(info.getDriverName());
             waybillCarVO.setDriverPhone(info.getDriverPhone());
-            List<String> list = new ArrayList<>();
-            list.add(info.getTruckNo());
-            Map<String, RTruckVo> trucks = remoteFleetService.findTruck(list);
-            if (CollectionUtils.isNotEmpty(trucks)) {
-                waybillCarVO.setTrailerNo(trucks.get(info.getTruckNo()) != null ? trucks.get(info.getTruckNo()).getTrailerNo() : null);
-            }
+            waybillCarVO.setTrailerNo(info.getTruckTrailerNo());
             // 票据
             waybillTicketVO.setLoadTime(DateUtil.getDateTime(info.getLoadTime()));
             waybillTicketVO.setLoadWeight(String.valueOf(info.getLoadAmount()));
@@ -224,8 +230,8 @@ public class WaybillManagementService {
             waybillBoardListVO.setTruckNo(String.valueOf(sckwWaybillOrder.getTruckNo()));
             waybillBoardListVO.setLoadGrossAmount(sckwWaybillOrder.getLoadGrossAmount() != null ? String.valueOf(sckwWaybillOrder.getLoadGrossAmount()) : null);
             waybillBoardListVO.setUnloadGrossAmount(sckwWaybillOrder.getUnloadGrossAmount() != null ? String.valueOf(sckwWaybillOrder.getUnloadGrossAmount()) : null);
-            waybillBoardListVO.setLoadUrls(sckwWaybillOrder.getLoadUrls() != null ? String.valueOf(sckwWaybillOrder.getLoadUrls()) : null);
-            waybillBoardListVO.setUnloadUrls(sckwWaybillOrder.getUnloadUrls() != null ? String.valueOf(sckwWaybillOrder.getUnloadUrls()) : null);
+            waybillBoardListVO.setLoadUrls(sckwWaybillOrder.getLoadUrls() != null ? FileUtils.getOSSAddressPrefix() + sckwWaybillOrder.getLoadUrls() : null);
+            waybillBoardListVO.setUnloadUrls(sckwWaybillOrder.getUnloadUrls() != null ? FileUtils.getOSSAddressPrefix() + sckwWaybillOrder.getUnloadUrls() : null);
             List<WaybillStatusVO> statusVOS2 = new ArrayList<>();
             statusVOS.forEach(e -> {
                 WaybillStatusVO temp = new WaybillStatusVO();
@@ -299,12 +305,12 @@ public class WaybillManagementService {
         }
 
         // 装货城市
-        if (StringUtils.isNotBlank(query.getLoadCityName()) && StringUtils.isNotEmpty(query.getLoadCityName())) {
-            criteria.and("loadCityName").is(query.getLoadCityName());
+        if (StringUtils.isNotBlank(query.getLoadCityCode())) {
+            criteria.and("loadCityCode").is(query.getLoadCityCode());
         }
         // 卸货城市
-        if (StringUtils.isNotBlank(query.getUnloadCityName()) && StringUtils.isNotEmpty(query.getUnloadCityName())) {
-            criteria.and("unloadCityName").is(query.getUnloadCityName());
+        if (StringUtils.isNotBlank(query.getUnloadCityCode())) {
+            criteria.and("unloadCityCode").is(query.getUnloadCityCode());
         }
         // 装载时间
         if (StringUtils.isNotBlank(query.getStartLoadTime()) && StringUtils.isNotEmpty(query.getEndLoadTime())) {
@@ -361,7 +367,7 @@ public class WaybillManagementService {
         topTotal.setName("全部");
         topTotal.setValue("all");
         topTotal.setTotal(0);
-        listMap.put("", topTotal);
+        listMap.put("all", topTotal);
         statuses.forEach(e -> {
             TableTops top = new TableTops();
             top.setValue(String.valueOf(e));