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

sckw-modules/sckw-system/src/main/java/com/sckw/system/repository/SysDictRepository.java

@@ -97,7 +97,8 @@ public class SysDictRepository extends ServiceImpl<SysDictDao, SysDict> {
         return list(Wrappers.<SysDict>lambdaQuery()
                 .eq(BaseModel::getDelFlag,0)
                 .eq(BaseModel::getStatus,0)
-                .like (StringUtils.isNotBlank( keyword), SysDict::getLabel, keyword));
+                .like (StringUtils.isNotBlank( keyword), SysDict::getLabel, keyword)
+                .last("limit 100"));
     }
 
     /**
@@ -105,8 +106,9 @@ public class SysDictRepository extends ServiceImpl<SysDictDao, SysDict> {
      */
     public Boolean updateStatus(Long id, Integer status) {
         SysDict sysDict = new SysDict();
-        sysDict.setStatus( status);
-        return update(sysDict, Wrappers.<SysDict>lambdaUpdate().eq(BaseModel::getId, id));
+        sysDict.setId(id);
+        sysDict.setStatus(status);
+        return updateById(sysDict);
     }
 
     public List<SysDict> queryByIds(Set<String> parentIds) {

sckw-modules/sckw-system/src/main/java/com/sckw/system/repository/SysDictTypeRepository.java

@@ -48,12 +48,15 @@ public class SysDictTypeRepository extends ServiceImpl<SysDictTypeDao, SysDictTy
     /**
      * 分页查询字典类型
      */
-    public IPage<SysDictType> selectPage(int pageNum, int pageSize, String name, String type, Integer status) {
+    public IPage<SysDictType> selectPage(int pageNum, int pageSize, String name, String type, Integer status,String  keyword) {
         return this.page(new Page<>(pageNum, pageSize), Wrappers.<SysDictType>lambdaQuery()
                 .eq(SysDictType::getDelFlag, 0)
                 .eq(Objects.nonNull( status), SysDictType::getStatus, status)
                 .like(StringUtils.isNotBlank( name),SysDictType::getName, name)
                 .like(StringUtils.isNotBlank(type), SysDictType::getType, type)
+                .and(StringUtils.isNotBlank(keyword),w -> w.like(SysDictType::getName, keyword)
+                        .or()
+                        .like(SysDictType::getType, keyword))
                 .orderByDesc(SysDictType::getCreateTime)
                );
     }

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/SysDictFlexBusinessService.java

@@ -14,6 +14,7 @@ import com.sckw.system.repository.SysDictRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -69,7 +70,7 @@ public class SysDictFlexBusinessService {
         sysDict.setValue(entity.getValue());
         sysDict.setLabel(entity.getLabel());
         sysDict.setType(entity.getType());
-        sysDict.setDescription(entity.getLabel());
+        sysDict.setDescription(entity.getDescription());
         sysDict.setSort(entity.getSort());
         sysDict.setParentId(entity.getParentId());
         sysDict.setRemark(entity.getRemark());
@@ -211,7 +212,7 @@ public class SysDictFlexBusinessService {
         BeanUtils.copyProperties(entity, resp);
         resp.setStatusName(Objects.equals(entity.getStatus(), 0) ? " 正常" : "锁定");
         // 设置父级字典名称
-        Long parentId = Optional.ofNullable(entity.getParentId()).map(Long::parseLong).orElse(null);
+        Long parentId = Optional.ofNullable(entity.getParentId()).filter(StringUtils::isNotBlank).map(Long::parseLong).orElse(null);
         SysDict parentDict = idAndParentDictMap.getOrDefault(parentId, new SysDict());
         resp.setParentName(parentDict.getLabel());
         return resp;

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/SysDictTypeService.java

@@ -95,7 +95,7 @@ public class SysDictTypeService {
         log.info("分页查询字典类型,请求参数：{}", JSON.toJSONString(reqVo));
         int pageNum = reqVo.getPageNum();
         int pageSize = reqVo.getPageSize();
-        IPage<SysDictType> page = sysDictTypeService.selectPage(pageNum, pageSize, reqVo.getName(), reqVo.getType(), reqVo.getStatus());
+        IPage<SysDictType> page = sysDictTypeService.selectPage(pageNum, pageSize, reqVo.getName(), reqVo.getType(), reqVo.getStatus(),reqVo.getKeyword());
         List<SysDictType> records = page.getRecords();
         if (CollectionUtils.isEmpty(records)) {
             return PageDataResult.empty(reqVo.getPageNum(), reqVo.getPageSize());

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/enuma/VehicleExceptionTypeEnum.java

@@ -3,7 +3,7 @@ package com.sckw.transport.model.enuma;
 import lombok.Getter;
 
 /**
- * @author AI Assistant
+ * @author cxf
  * @desc 车辆异常类型枚举
  * @date 2025-12-01
  */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtWaybillOrderRepository.java

@@ -187,7 +187,7 @@ public class KwtWaybillOrderRepository extends ServiceImpl<KwtWaybillOrderMapper
      * @param truckNo 车牌号关键字（模糊匹配）
      * @return 车辆列表（按车牌号分组去重，最多返回100条）
      */
-    public List<KwtWaybillOrder> selectTruckListForSelect(String truckNo) {
+    public List<KwtWaybillOrder> selectTruckListForSelect(String truckNo,Long entId) {
         LambdaQueryWrapper<KwtWaybillOrder> wrapper = Wrappers.<KwtWaybillOrder>lambdaQuery()
                 .select(KwtWaybillOrder::getTruckId,
                         KwtWaybillOrder::getTruckNo,
@@ -196,6 +196,7 @@ public class KwtWaybillOrderRepository extends ServiceImpl<KwtWaybillOrderMapper
                         KwtWaybillOrder::getDriverPhone,
                         KwtWaybillOrder::getStatus)
                 .eq(KwtWaybillOrder::getDelFlag, 0)
+                .eq(KwtWaybillOrder::getEntId,entId)
                 .like(StringUtils.isNotBlank(truckNo), KwtWaybillOrder::getTruckNo, truckNo)
                 .groupBy(KwtWaybillOrder::getTruckNo)
                 .orderByDesc(KwtWaybillOrder::getUpdateTime)

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

@@ -21,7 +21,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * @author AI Assistant
+ * @author cxf
  * @desc 车辆异常图片Service
  * @date 2025-12-01
  */

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

@@ -686,7 +686,7 @@ public class kwfTruckTraceService {
         log.info("查询车辆下拉列表参数：{}", JSON.toJSONString( req));
         
         // 使用 Repository 查询车辆运单数据
-        List<KwtWaybillOrder> waybillOrders = kwtWaybillOrderRepository.selectTruckListForSelect(req.getTruckNo());
+        List<KwtWaybillOrder> waybillOrders = kwtWaybillOrderRepository.selectTruckListForSelect(req.getTruckNo(),LoginUserHolder.getUserId());
         
         if (CollectionUtils.isEmpty(waybillOrders)) {
             return new ArrayList<>();
@@ -760,7 +760,7 @@ public class kwfTruckTraceService {
         vo.setDriverName(order.getDriverName());
         vo.setDriverPhone(order.getDriverPhone());
         vo.setStatus(order.getStatus());
-        vo.setStatusDesc(CarWaybillEnum.getName(order.getStatus()));
+        vo.setStatusDesc(CarWaybillV1Enum.geDesc(order.getStatus()));
 
         // 设置定位状态
         Integer locationStatus = truckLocationStatusMap.getOrDefault(order.getTruckNo(), 0);
@@ -779,8 +779,8 @@ public class kwfTruckTraceService {
         log.info("分页查询地图车辆列表参数：{}", req);
         Set<Long> allEnt = getAllEnt();
         // 处理日期参数，默认为当天
-        Date startDate = getDate(req.getStartDate());
-        Date endDate = getDate(req.getEndDate());
+        Date startDate = getStartDate(req.getStartDate());
+        Date endDate = getEndDate(req.getEndDate());
 
         // 进行中任务状态：已接单(1)、到达装货点(5)、已装货(10)、已离场(15)
         List<Integer> taskingStatus = Lists.newArrayList();
@@ -977,7 +977,7 @@ public class kwfTruckTraceService {
     }
 
     @NotNull
-    private static Date getDate(String date) {
+    private static Date getStartDate(String date) {
         Date startDate;
         if (StringUtils.isBlank(date)) {
             startDate = DateUtils.getStartOfDay(new Date());
@@ -993,6 +993,23 @@ public class kwfTruckTraceService {
         }
         return startDate;
     }
+    @NotNull
+    private static Date getEndDate(String date) {
+        Date startDate;
+        if (StringUtils.isBlank(date)) {
+            startDate = DateUtils.getEndOfDay(new Date());
+        } else {
+            try {
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                startDate = sdf.parse(date);
+                startDate = DateUtils.getEndOfDay(startDate);
+            } catch (Exception e) {
+                log.error("解析开始日期失败", e);
+                startDate = DateUtils.getEndOfDay(new Date());
+            }
+        }
+        return startDate;
+    }
 
     /**
      * 批量查询车辆定位信息
@@ -1197,7 +1214,7 @@ public class kwfTruckTraceService {
         Set<Long> allEnt = Sets.newHashSet();
         //根据企业类型查询企业
 
-        allEnt.add( LoginUserHolder.getUserId());
+        allEnt.add(253145323650682880L);
         EntCacheResDto entCacheResDto = remoteSystemService.queryEntTreeById(LoginUserHolder.getUserId());
         if (Objects.nonNull(entCacheResDto)) {
             EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntTreeById(entCacheResDto.getId());