From a837aade3a9245b27bc9a578984f2e54dd080b84 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 08 Apr 2026 19:03:52 +0800
Subject: [PATCH] opt: 更新工单结果

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdTaskResultServiceImpl.java |   24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdTaskResultServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdTaskResultServiceImpl.java
index de7156b..c88ccd1 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdTaskResultServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdTaskResultServiceImpl.java
@@ -21,6 +21,7 @@
 import org.sxkj.gd.workorder.excel.GdTaskResultExcel;
 import org.sxkj.gd.workorder.mapper.GdTaskResultMapper;
 import org.sxkj.gd.workorder.service.IGdTaskResultService;
+import org.sxkj.common.utils.HeaderUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -63,25 +64,20 @@
 	@Override
 	public boolean saveBatchTaskResult(List<GdTaskResultEntity> gdTaskResultEntities) {
 		gdTaskResultEntities.forEach(gdTaskResult -> {
-			String areaCode = gdTaskResult.getAreaCode();
-			if (areaCode != null && !areaCode.isEmpty()) {
-				// 分割区域代码并只取最后一组
-				String[] codes = areaCode.split(",");
-				if (codes.length > 0) {
-					// 取最后一组并去除空格
-					String lastCode = codes[codes.length - 1].trim();
-					if (!lastCode.isEmpty()) {
-						// 补零到12位
-						String padded = lastCode + "000000000000".substring(lastCode.length());
-						gdTaskResult.setAreaCode(padded);
-					}
-				}
-			}
+			// 使用HeaderUtils处理区域代码
+			String processedAreaCode = HeaderUtils.processAreaCode(gdTaskResult.getAreaCode());
+			gdTaskResult.setAreaCode(processedAreaCode);
 		});
 		// 执行批量保存并返回结果
 		return saveBatch(gdTaskResultEntities);
 	}
 
+	@Override
+	public boolean updateTaskResultById(GdTaskResultEntity taskResult) {
+		int result = baseMapper.updateTaskResultById(taskResult);
+		return result > 0;
+	}
+
 	/**
 	 * 将URL中的HTML/XML转义字符还原为原始字符
 	 * 主要处理 &amp; 转换为 &

--
Gitblit v1.9.3