From 92dc5972adbd94d47c0e6501ce4a7b51af09e3c3 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 26 Jun 2026 22:37:57 +0800
Subject: [PATCH] refactor(workorder): 重构工单状态聚合逻辑-只处理撤回任务状态
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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..d1e6ca0 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())) {
--
Gitblit v1.9.3