From 39de4360c0953f655531a1b859bf6b179bbe0c2a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 29 Jun 2026 09:27:48 +0800
Subject: [PATCH] fix(workorder): 修复任务状态更新中的类型转换问题

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java
index d1e6ca0..4014d11 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java
@@ -243,13 +243,14 @@
 		boolean updateResult = updateById(workOrder);
 
 		// 5. 把待验收的都改为待签收状态
+		// 修复类型不匹配问题:将 String 转为 Integer,因为数据库字段是 smallint 类型
 		if (operationType == 10) {
 			return gdPatrolTaskService.update(Wrappers.<GdPatrolTaskEntity>lambdaUpdate()
-				.set(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.PENDING_SIGNING.getValue())
+				.set(GdPatrolTaskEntity::getTaskStatus, Integer.parseInt(PatrolTaskStatusEnum.PENDING_SIGNING.getValue()))
 				.eq(GdPatrolTaskEntity::getWorkOrderId, workOrder.getId())
 				.in(GdPatrolTaskEntity::getTaskStatus,
-					PatrolTaskStatusEnum.AUDIT_PASSED.getValue(),
-					PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue())
+					Integer.parseInt(PatrolTaskStatusEnum.AUDIT_PASSED.getValue()),
+					Integer.parseInt(PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue()))
 			);
 		}
 		// 6. 保存流转记录

--
Gitblit v1.9.3