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

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/repository/KwcContractLogisticsRepository.java

@@ -77,10 +77,11 @@ public class KwcContractLogisticsRepository extends ServiceImpl<KwcContractLogis
     public List<KwcContractLogistics> queryValidByEntId(Long entId) {
         return list(Wrappers.<KwcContractLogistics>lambdaQuery()
                 .eq(KwcContractLogistics::getEntId, entId)
+                .eq(KwcContractLogistics::getDispatchWay, 2)
                 .eq(KwcContractLogistics::getDelFlag, 0)
                 .eq(KwcContractLogistics::getStatus, 0)
                 .and(queryWrapper -> queryWrapper.apply("{0} between start_time and end_time",new Date())
-                        //.or(queryWrapper1->queryWrapper1.le(KwcContractLogistics::getStartTime, new Date()).isNull(KwcContractLogistics::getEndTime))
+                        .or(queryWrapper1->queryWrapper1.le(KwcContractLogistics::getStartTime, new Date()).isNull(KwcContractLogistics::getEndTime))
                 ));
     }
 
@@ -113,7 +114,7 @@ public class KwcContractLogisticsRepository extends ServiceImpl<KwcContractLogis
                         .or().between(KwcContractLogistics::getEndTime, startTime, endTime)
                         .or(queryWrapper1->queryWrapper1.le(KwcContractLogistics::getStartTime, startTime).ge(KwcContractLogistics::getEndTime, endTime))
                         // 结束日期为空，代表长期有效
-                        //.or(queryWrapper2->queryWrapper2.ge(KwcContractLogistics::getStartTime, endTime).isNull(KwcContractLogistics::getEndTime))
+                        .or(queryWrapper2->queryWrapper2.ge(KwcContractLogistics::getStartTime, endTime).isNull(KwcContractLogistics::getEndTime))
                 ));
     }
 

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/impl/KwcContractLogisticsScoreServiceImpl.java

@@ -200,7 +200,7 @@ public class KwcContractLogisticsScoreServiceImpl implements IKwcContractLogisti
     {
         LogisticsScoreQueryDto scoreReqDto = new LogisticsScoreQueryDto();
         providerEntId = providerEntId !=null ? providerEntId : LoginUserHolder.getEntId();
-        //1.查询当前供应商企业有效的物流合同
+        //1.查询当前供应商企业有效的自动派车物流合同
         List<KwcContractLogistics> logisticsContracts = kwcContractLogisticsRepository.queryValidByEntId(providerEntId);
         List<Long> contractIds = logisticsContracts.stream().map(KwcContractLogistics::getId).toList();
         if(CollectionUtils.isNotEmpty(contractIds)){