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

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

@@ -469,7 +469,7 @@ public class KwTransportService {
         HttpResult result = new HttpResult();
         if (String.valueOf(NumberConstant.ONE).equals(contractParam.getContractType())) {
             result = getLogisticsOrderContract(contractParam,"1");
-        } else if (String.valueOf(NumberConstant.ONE).equals(contractParam.getContractType())) {
+        } else if (String.valueOf(NumberConstant.TWO).equals(contractParam.getContractType())) {
             result = getLogisticsOrderContract(contractParam,"2");
         } else {
             return HttpResult.error("合同类型错误");

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderMapper.java

@@ -29,7 +29,15 @@ public interface KwtWaybillOrderMapper extends BaseMapper<KwtWaybillOrder> {
 
     List<OrderCarDTO> selectWaybillOrderCarList(@Param("id") String id, @Param("page") int page, @Param("pageSize") int pageSize);
 
-    List<OrderCarDTO> selectWaybillOrderCarListGroupByTruckNo(@Param("ids") List<String> ids, @Param("page") int page, @Param("pageSize") int pageSize);
+    /**
+     * 托运订单-承运订单-通过单据号根据车牌号分组获取车辆信息统计信息
+     * @param ids
+     * @param statusList
+     * @param page
+     * @param pageSize
+     * @return
+     */
+    List<OrderCarDTO> selectWaybillOrderCarListGroupByTruckNo(@Param("ids") List<String> ids, @Param("statusList") List<Integer> statusList , @Param("page") int page, @Param("pageSize") int pageSize);
 
     Long selectWaybillOrderCarCount(@Param("id") String id);
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/CarWaybillVO.java

@@ -77,6 +77,7 @@ public class CarWaybillVO {
     /**
      * 装货时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private String loadDateTime;
     /**
      * 实卸量/吨

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

@@ -19,6 +19,7 @@ import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.DateUtil;
 import com.sckw.excel.utils.ValidUtil;
 import com.sckw.fleet.api.RemoteFleetService;
+import com.sckw.fleet.api.model.vo.RTruckVo;
 import com.sckw.mongo.enums.BusinessTypeEnum;
 import com.sckw.mongo.model.SckwLogisticsOrder;
 import com.sckw.product.api.dubbo.GoodsInfoService;
@@ -291,7 +292,7 @@ public class ConsignOrderService {
             return HttpResult.ok();
         }
         List<CarWaybillVO> returnList = new ArrayList<>();
-        list= list.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList());
+        list = list.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList());
         for (String id : list) {
             KwtLogisticsOrder order = kwtLogisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
                             .eq(StringUtils.isNotBlank(id), KwtLogisticsOrder::getId, Long.parseLong(id))
@@ -320,10 +321,11 @@ public class ConsignOrderService {
                      * 合理损耗值=装货量*合理损耗
                      扣亏量/吨->亏吨量-合理损耗值
                      */
+                    BigDecimal loadAmount = kwtWaybillOrder.getLoadAmount() == null ? new BigDecimal("0.00") : kwtWaybillOrder.getLoadAmount();
                     //已委托量
                     BigDecimal entrustAmount = kwtWaybillOrder.getEntrustAmount() == null ? new BigDecimal("0.00") : kwtWaybillOrder.getEntrustAmount();
                     //合理损耗值
-                    BigDecimal multiply = entrustAmount.multiply(loss.divide(BigDecimal.valueOf(1000L)));
+                    BigDecimal multiply = loadAmount.multiply(loss.divide(BigDecimal.valueOf(1000L)));
                     //亏吨量
                     BigDecimal defectiveWeigh = kwtWaybillOrder.getDeficitAmount() == null ? new BigDecimal("0.00") : kwtWaybillOrder.getDeficitAmount();
                     //扣亏量/吨
@@ -346,14 +348,14 @@ public class ConsignOrderService {
                     carWaybillVo.setSendCarDate(DateUtil.getDateTime(kwtWaybillOrder.getCreateTime()));
                     if (loadTicket != null) {
                         carWaybillVo.setLoadAmount(loadTicket.getAmount() == null ? null : String.valueOf(loadTicket.getAmount()));
-                        carWaybillVo.setLoadDateTime(loadTicket.getCreateTime() == null ? null : DateUtil.getDateTime(loadTicket.getCreateTime()));
+                        carWaybillVo.setLoadDateTime(loadTicket.getOperateTime() == null ? null : DateUtil.getDateTime(loadTicket.getOperateTime()));
                     } else {
                         carWaybillVo.setLoadAmount(null);
                         carWaybillVo.setLoadDateTime(null);
                     }
                     if (unloadTicket != null) {
                         carWaybillVo.setUnloadAmount(unloadTicket.getAmount() == null ? null : String.valueOf(unloadTicket.getAmount()));
-                        carWaybillVo.setUnloadDateTime(unloadTicket.getCreateTime() == null ? null : DateUtil.getDateTime(unloadTicket.getCreateTime()));
+                        carWaybillVo.setUnloadDateTime(unloadTicket.getOperateTime() == null ? null : DateUtil.getDateTime(unloadTicket.getOperateTime()));
                     } else {
                         carWaybillVo.setUnloadAmount(null);
                         carWaybillVo.setUnloadDateTime(null);
@@ -365,6 +367,8 @@ public class ConsignOrderService {
                     carWaybillVo.setCreateTime(kwtWaybillOrder.getCreateTime());
 //                carWaybillVo.setAppointor(remoteSystemService.queryUserCacheById(kwtWaybillOrder.getCreateBy()) == null ?
 //                        String.valueOf(kwtWaybillOrder.getCreateBy()) : remoteSystemService.queryUserCacheById(kwtWaybillOrder.getCreateBy()).getName());
+                    carWaybillVo.setLOrderNo(order.getLOrderNo());
+                    carWaybillVo.setLOrderId(String.valueOf(order.getId()));
                     returnList.add(carWaybillVo);
                 }
             }
@@ -424,10 +428,11 @@ public class ConsignOrderService {
                      * 合理损耗值=装货量*合理损耗
                      扣亏量/吨->亏吨量-合理损耗值
                      */
+                    BigDecimal loadAmount = kwtWaybillOrder.getLoadAmount() == null ? new BigDecimal("0.00") : kwtWaybillOrder.getLoadAmount();
                     //已委托量
                     BigDecimal entrustAmount = kwtWaybillOrder.getEntrustAmount() == null ? new BigDecimal("0.00") : kwtWaybillOrder.getEntrustAmount();
                     //合理损耗值
-                    BigDecimal multiply = entrustAmount.multiply(loss.divide(BigDecimal.valueOf(1000L)));
+                    BigDecimal multiply = loadAmount.multiply(loss.divide(BigDecimal.valueOf(1000L)));
                     //亏吨量
                     BigDecimal defectiveWeigh = kwtWaybillOrder.getDeficitAmount() == null ? new BigDecimal("0.00") : kwtWaybillOrder.getDeficitAmount();
                     //扣亏量/吨
@@ -448,14 +453,14 @@ public class ConsignOrderService {
                     carWaybillVo.setSendCarDate(DateUtil.getDateTime(kwtWaybillOrder.getCreateTime()));
                     if (loadTicket != null) {
                         carWaybillVo.setLoadAmount(loadTicket.getAmount() == null ? null : String.valueOf(loadTicket.getAmount()));
-                        carWaybillVo.setLoadDateTime(loadTicket.getCreateTime() == null ? null : DateUtil.getDateTime(loadTicket.getCreateTime()));
+                        carWaybillVo.setLoadDateTime(loadTicket.getOperateTime() == null ? null : DateUtil.getDateTime(loadTicket.getOperateTime()));
                     } else {
                         carWaybillVo.setLoadAmount(null);
                         carWaybillVo.setLoadDateTime(null);
                     }
                     if (unloadTicket != null) {
                         carWaybillVo.setUnloadAmount(unloadTicket.getAmount() == null ? null : String.valueOf(unloadTicket.getAmount()));
-                        carWaybillVo.setUnloadDateTime(unloadTicket.getCreateTime() == null ? null : DateUtil.getDateTime(unloadTicket.getCreateTime()));
+                        carWaybillVo.setUnloadDateTime(unloadTicket.getOperateTime() == null ? null : DateUtil.getDateTime(unloadTicket.getOperateTime()));
                     } else {
                         carWaybillVo.setUnloadAmount(null);
                         carWaybillVo.setUnloadDateTime(null);
@@ -467,6 +472,8 @@ public class ConsignOrderService {
                     carWaybillVo.setCreateTime(kwtWaybillOrder.getCreateTime());
 //                carWaybillVo.setAppointor(remoteSystemService.queryUserCacheById(kwtWaybillOrder.getCreateBy()) == null ?
 //                        String.valueOf(kwtWaybillOrder.getCreateBy()) : remoteSystemService.queryUserCacheById(kwtWaybillOrder.getCreateBy()).getName());
+                    carWaybillVo.setLOrderNo(order.getLOrderNo());
+                    carWaybillVo.setLOrderId(String.valueOf(order.getId()));
                     returnList.add(carWaybillVo);
                 }
             }
@@ -510,16 +517,19 @@ public class ConsignOrderService {
         if (CollectionUtils.isEmpty(stringList)) {
             return HttpResult.ok();
         }
-        List<OrderCarDTO> list = kwtWaybillOrderMapper.selectWaybillOrderCarListGroupByTruckNo(stringList, orderDto.getPage()-1, orderDto.getPageSize());
-//        if (CollectionUtils.isNotEmpty(list)) {
-//            List<String> stringList = list.stream().map(OrderCarDTO::getTruckNo).collect(Collectors.toList());
-//            Map<String, RTruckVo> truck = remoteFleetService.findTruck(stringList);
-//            for (OrderCarDTO dto : list) {
-//                dto.setLoadAmount(truck.get(dto.getTruckNo()) == null ?
-//                        null : (truck.get(dto.getTruckNo()).getActualWeight() == null ?
-//                        null : (String.valueOf(truck.get(dto.getTruckNo()).getActualWeight()))));
-//            }
-//        }
+        List<Integer> statusList = new ArrayList<>();
+        statusList.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode());
+        statusList.add(CarWaybillEnum.APPROVAL_PASS.getCode());
+        List<OrderCarDTO> list = kwtWaybillOrderMapper.selectWaybillOrderCarListGroupByTruckNo(stringList, statusList,orderDto.getPage() - 1, orderDto.getPageSize());
+        if (CollectionUtils.isNotEmpty(list)) {
+            List<String> stringLists = list.stream().map(OrderCarDTO::getTruckNo).collect(Collectors.toList());
+            Map<String, RTruckVo> truck = remoteFleetService.findTruck(stringLists);
+            for (OrderCarDTO dto : list) {
+                dto.setLoadAmount(truck.get(dto.getTruckNo()) == null ?
+                        null : (truck.get(dto.getTruckNo()).getActualWeight() == null ?
+                        null : (String.valueOf(truck.get(dto.getTruckNo()).getActualWeight()))));
+            }
+        }
         PageResult build = PageResult.build(orderDto.getPage(), orderDto.getPageSize(), (long) list.size(), list);
         return HttpResult.ok(build);
     }

sckw-modules/sckw-transport/src/main/resources/mapper/KwtWaybillOrderMapper.xml

@@ -211,6 +211,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="statusList != null and statusList.size() > 0">
+                and a.status in
+                <foreach collection="statusList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         GROUP BY
         a.truck_no