|
|
@@ -11,6 +11,7 @@ import org.apache.commons.collections4.CollectionUtils;
|
|
|
import org.springframework.stereotype.Repository;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
+import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.Objects;
|
|
|
import java.util.Set;
|
|
|
@@ -78,4 +79,22 @@ public class KwcContractLogisticsRepository extends ServiceImpl<KwcContractLogis
|
|
|
.like(org.apache.commons.lang3.StringUtils.isNotBlank(contractNo),KwcContractLogistics::getContractNo, contractNo)
|
|
|
.like(org.apache.commons.lang3.StringUtils.isNotBlank(contractName),KwcContractLogistics::getName, contractName));
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 查询时间范围内的指定派车方式的物流合同
|
|
|
+ * @param contractIdList
|
|
|
+ * @param startTime
|
|
|
+ * @param endTime
|
|
|
+ * @param dispatchingType
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ public KwcContractLogistics queryBy(Set<Long> contractIdList, Date startTime, Date endTime, Integer dispatchingType) {
|
|
|
+ return getOne(Wrappers.<KwcContractLogistics>lambdaQuery()
|
|
|
+ .eq(KwcContractLogistics::getDelFlag, 0)
|
|
|
+ .in(KwcContractLogistics::getId, contractIdList)
|
|
|
+ .eq(KwcContractLogistics::getDispatching, dispatchingType)
|
|
|
+ .and(queryWrapper -> queryWrapper.between(KwcContractLogistics::getStartTime, startTime, endTime)
|
|
|
+ .or().between(KwcContractLogistics::getEndTime, startTime, endTime)
|
|
|
+ .or(queryWrapper1->queryWrapper1.le(KwcContractLogistics::getStartTime, startTime).ge(KwcContractLogistics::getEndTime, endTime))));
|
|
|
+ }
|
|
|
}
|