From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 14:09:29 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 74e4633..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
@@ -61,7 +61,7 @@
public IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, WorkOrderPageParam gdWorkOrder) {
if (gdWorkOrder.getIsQueryAll()) {
List<Long> deptList = new ArrayList<>();
- if (!AuthUtil.isAdministrator() || !AuthUtil.isAdmin()) {
+ if (!(AuthUtil.isAdministrator() || AuthUtil.isAdmin())) {
deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
}
gdWorkOrder.setDeptList(deptList);
@@ -97,7 +97,7 @@
if (centerCoords == null || centerCoords.length < 2) {
return false;
}
- String countyCode = GdGeoAddressUtil.getCountyCode(centerCoords[0], centerCoords[1]);
+ String countyCode = GdGeoAddressUtil.getTownCode(centerCoords[0], centerCoords[1]);
entity.setAreaCode(countyCode);
// 生成工单编号
if (StringUtils.isBlank(entity.getWorkOrderCode())) {
@@ -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