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 | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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 21ecd53..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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
@@ -11,10 +12,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.sxkj.common.constant.CommonConstant;
import org.sxkj.common.constant.WordOrderConstant;
import org.sxkj.common.utils.GeomUtils;
import org.sxkj.common.utils.OrderNumUtils;
+import org.sxkj.gd.utils.GdGeoAddressUtil;
import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
import org.sxkj.gd.workorder.entity.GdWorkOrderFlowEntity;
@@ -42,6 +43,7 @@
* @author lw
* @since 2026-01-14
*/
+@Slf4j
@Service
public class GdWorkOrderServiceImpl extends BaseServiceImpl<GdWorkOrderMapper, GdWorkOrderEntity> implements IGdWorkOrderService {
@@ -51,7 +53,7 @@
private IGdPatrolTaskService gdPatrolTaskService;
@Override
- public GdWorkOrderEntity getWorkOrderDetail(GdWorkOrderEntity gdWorkOrder) {
+ public GdWorkOrderVO getWorkOrderDetail(GdWorkOrderEntity gdWorkOrder) {
return baseMapper.getWorkOrderDetail(gdWorkOrder);
}
@@ -59,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);
@@ -77,12 +79,6 @@
return gdWorkOrderList;
}
- /**
- * 保存工单任务表
- *
- * @param workOrderParam
- * @return
- */
@Override
@Transactional(rollbackFor = Exception.class)
public boolean saveOrUpdateWorkOrder(WorkOrderAddParam workOrderParam) {
@@ -96,6 +92,13 @@
}
entity.setGeom(validatedGeom);
+ // 从几何数据中提取中心点坐标，用于获取行政区划编码
+ double[] centerCoords = GeomUtils.extractCenterPoint(validatedGeom);
+ if (centerCoords == null || centerCoords.length < 2) {
+ return false;
+ }
+ String countyCode = GdGeoAddressUtil.getTownCode(centerCoords[0], centerCoords[1]);
+ entity.setAreaCode(countyCode);
// 生成工单编号
if (StringUtils.isBlank(entity.getWorkOrderCode())) {
String timestamp = OrderNumUtils.initOrderNum(WordOrderConstant.ORDER_REDIS_KEY);
@@ -240,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