From ef327df373735b12450fb2e2eb107de29552d99a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 05 Jun 2026 18:13:12 +0800
Subject: [PATCH] fix(workorder): 修复工单和巡检任务查询的类型匹配问题
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
index e18d80d..9660d53 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
@@ -801,6 +801,11 @@
// 去除空格并确保长度为6位
String cleanCode = areaCode.trim();
+ // 如果长度大于6位，只取前6位
+ if (cleanCode.length() > 6) {
+ log.warn("区域编码长度超过6位，截取前6位: {}", cleanCode);
+ cleanCode = cleanCode.substring(0, 6);
+ }
if (cleanCode.length() != 6) {
log.warn("区域编码格式不正确，期望6位数字，实际为: {}", cleanCode);
return cleanCode;
@@ -809,7 +814,7 @@
try {
// 提取省、市、区三级编码
String provinceCode = cleanCode.substring(0, 2) + "00"; // 省级编码（如：3600）
- String cityCode = cleanCode.substring(0, 4) + "0"; // 市级编码（如：3608）
+ String cityCode = cleanCode.substring(0, 4); // 市级编码（如：3608）
String districtCode = cleanCode; // 区级编码（如：360802）
return provinceCode + "," + cityCode + "," + districtCode;
--
Gitblit v1.9.3