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

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -399,7 +399,7 @@ public class KwfDriverService {
         
         log.info("调用truckService.saveTruck保存车辆档案，truckNo={}", request.getTruckNo());
         try {
-            truckService.saveTruck(truckSaveParam);
+            truckService.saveTruck1(truckSaveParam);
             log.info("车辆档案保存成功，truckNo={}", request.getTruckNo());
         } catch (Exception e) {
             log.error("车辆档案保存异常，truckNo={}", request.getTruckNo(), e);

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -2363,7 +2363,77 @@ public class KwfTruckService {
         }
 
     }
+    /**
+     * 保存车辆
+     * @param param
+     * @return
+     */
+    public void saveTruck1(TruckSaveParam param) {
+        log.info("保存车辆，id：{}", JSON.toJSONString(param));
+        if (Objects.equals(param.getEnergyType(), TruckEnergyTypeEnum.TRADITIONAL.getCode())) {
+            if (param.getEev() == null) {
+                throw new BusinessPlatfromException(ErrorCodeEnum.PARAM_ERROR, "传统能源车辆的排放标准不能为空！");
+            }
+        }
 
+        // 新增
+        if (param.getId() == null) {
+            KwfTruck kwfTruck = kwfTruckRepository.getOne(Wrappers.<KwfTruck>lambdaQuery()
+                    .eq(KwfTruck::getTruckNo, param.getTruckNo()));
+            KwfTruck truck = new KwfTruck();
+            truck.setTruckNo(param.getTruckNo());
+            truck.setType(param.getType());
+            truck.setEnergyType(param.getEnergyType());
+            truck.setEev(param.getEev());
+            truck.setCarAxis(param.getCarAxis());
+            truck.setBrand(param.getBrand());
+            truck.setVin(param.getVin());
+            truck.setEngineNo(param.getEngineNo());
+            truck.setAnnualInspectionTime(param.getAnnualInspectionTime());
+            truck.setTransportValidityTime(param.getTransportValidityTime());
+            truck.setPositionDevice(param.getPositionDevice());
+            truck.setTruckLicense(param.getTruckLicense());
+            truck.setTransportLicense(param.getTransportLicense());
+            truck.setEnvironmentalList(param.getEnvironmentalList());
+            truck.setStatus(TruckStatusEnum.NORMAL.getCode());
+            truck.setDelFlag(0);
+            truck.setBlacklist(0);
+            truck.setCreateTime(new Date());
+            kwfTruckRepository.save(truck);
+
+            // 车队班组绑定
+            truckFleetEdit(truck.getId(), param.getFleetId());
+
+            // 车辆信息与企业关联信息
+            truckEntEdit(truck);
+        } else {
+            // 更新车辆
+            KwfTruck truck = kwfTruckRepository.getById(param.getId());
+            if (truck == null) {
+                throw new BusinessPlatfromException(ErrorCodeEnum.DRIVER_NOT_FOUND, "车辆不已存在");
+            }
+            truck.setTruckNo(param.getTruckNo());
+            truck.setType(param.getType());
+            truck.setEnergyType(param.getEnergyType());
+            truck.setEev(param.getEev());
+            truck.setCarAxis(param.getCarAxis());
+            truck.setBrand(param.getBrand());
+            truck.setVin(param.getVin());
+            truck.setEngineNo(param.getEngineNo());
+            truck.setAnnualInspectionTime(param.getAnnualInspectionTime());
+            truck.setTransportValidityTime(param.getTransportValidityTime());
+            truck.setPositionDevice(param.getPositionDevice());
+            truck.setTruckLicense(param.getTruckLicense());
+            truck.setTransportLicense(param.getTransportLicense());
+            truck.setEnvironmentalList(param.getEnvironmentalList());
+            truck.setUpdateTime(new Date());
+            kwfTruckRepository.updateById(truck);
+
+            // 车队班组绑定
+            truckFleetEdit(truck.getId(), param.getFleetId());
+        }
+
+    }
     /**
      * 车辆停用/启用
      * @param param

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

@@ -3683,7 +3683,7 @@ public class KwtAcceptCarriageOrderService {
         kwtLogisticsOrder.setStartTime(Objects.isNull(orderDTO.getStartTime()) ?
                 null : DateUtil.localDateToLocalDateTimeStart(orderDTO.getStartTime()));
         kwtLogisticsOrder.setEndTime(Objects.isNull(orderDTO.getEndTime()) ?
-                null : orderDTO.getEndTime().atTime(LocalTime.MAX));
+                null : orderDTO.getEndTime().atTime(23, 59, 59));
         BigDecimal decimal = BigDecimal.ZERO ;
         kwtLogisticsOrder.setSubcontractAmount(decimal);
         kwtLogisticsOrder.setEntrustAmount(decimal);