万盛计量跨期bug,G10公式坐标bug

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/MileageClientImpl.java

@@ -1,5 +1,6 @@
 package org.springblade.business.feignClient;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.springblade.business.entity.MileagePart;
@@ -35,7 +36,14 @@ public class MileageClientImpl implements MileageClient {
         Map<String, List<String>> group = mileages.stream().collect(Collectors.groupingBy(e -> e.replaceAll("K.+", StringPool.EMPTY)));
         for (Map.Entry<String, List<String>> entry : group.entrySet()) {
             String part = entry.getKey();
-            MileagePart mileagePart=this.partService.getOne(Wrappers.<MileagePart>lambdaQuery().eq(MileagePart::getContractId,contractId.toString()).eq(MileagePart::getPrefix,part).last(" limit 1 "));
+            LambdaQueryWrapper<MileagePart> lambdaQuery = new LambdaQueryWrapper<>();
+            lambdaQuery.eq(MileagePart::getIsDeleted, 0)
+                .eq(MileagePart::getContractId, contractId)
+                .and(wrapper -> wrapper.eq(MileagePart::getPrefix, part)
+                    .or()
+                    .isNull(MileagePart::getPrefix))
+                .last("limit 1");
+            MileagePart   mileagePart = partService.getOne(lambdaQuery);
             if(mileagePart!=null) {
                 List<Mileagexy> target = this.service.list(Wrappers.<Mileagexy>lambdaQuery().eq(Mileagexy::getPartId, mileagePart.getId()).orderByAsc(Mileagexy::getValue));
                 if (CollectionUtil.isNotEmpty(target)) {