From b486873000ea043f159c8de5c0edb123c0f38a87 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 09 Jun 2026 08:36:34 +0800
Subject: [PATCH] refactor(flyer): 修改飞手表单和实体类中的擅长任务类型字段
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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..7806126 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
@@ -603,7 +603,7 @@
attach.setOriginalName(bladeFile.getOriginalName());
attach.setAttachSize(reportFile.length());
attach.setExtension(FileUtil.getFileExtension(reportFile.getName()));
- attach.setResultType(JSON.toJSONString(resultType));
+ attach.setResultType(resultType);
attach.setPatrolTaskId(String.valueOf(taskEntity != null ? taskEntity.getId() : null));
Long createUser = taskEntity != null ? taskEntity.getCreateUser() : null;
Long updateUser = taskEntity != null ? taskEntity.getUpdateUser() : null;
@@ -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