From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 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 082299c..4079ca6 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
@@ -1,6 +1,5 @@
package org.sxkj.gd.workorder.service.impl;
-import com.alibaba.druid.support.json.JSONUtils;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -33,9 +32,9 @@
import org.sxkj.gd.workorder.vo.GdWorkOrderVO;
import org.sxkj.system.cache.SysCache;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Objects;
/**
* 工单任务表 服务实现类
@@ -59,7 +58,10 @@
@Override
public IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, WorkOrderPageParam gdWorkOrder) {
if (gdWorkOrder.getIsQueryAll()) {
- List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ List<Long> deptList = new ArrayList<>();
+ if (!AuthUtil.isAdministrator()) {
+ deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ }
gdWorkOrder.setDeptList(deptList);
}
return page.setRecords(baseMapper.selectGdWorkOrderPage(page, gdWorkOrder));
@@ -114,10 +116,6 @@
entity.setWorkOrderStatus(WorkOrderStatusEnum.PUBLISHING_ACCEPTING.getCode());
newStatusEnum = WorkOrderStatusEnum.PUBLISHING_ACCEPTING;
break;
- // case "24": // 响应中_拒绝取消 → 响应中_申请取消
- // entity.setWorkOrderStatus(WorkOrderStatusEnum.RESPONDING_APPLY_CANCEL.getCode());
- // newStatusEnum = WorkOrderStatusEnum.RESPONDING_APPLY_CANCEL;
- // break;
case "20": // 响应中_待拆分 → 响应中_申请修改
entity.setWorkOrderStatus(WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY.getCode());
newStatusEnum = WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY;
@@ -126,10 +124,6 @@
// 直接生成快照，无需处理geom字段
entity.setFullSnapshot(JSON.toJSONString(orderEntity));
break;
- // case "25": // 响应中_拒绝修改 → 响应中_申请修改
- // entity.setWorkOrderStatus(WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY.getCode());
- // newStatusEnum = WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY;
- // break;
}
saveResult = updateById(entity);
} else {
@@ -149,9 +143,11 @@
flowEntity.setCreateUser(AuthUtil.getUserId());
flowEntity.setWorkOrderId(entity.getId());
flowEntity.setFlowName(newStatusEnum.getStageDesc());
- flowEntity.setFlowDesc(String.format("%s %s", AuthUtil.getUserName(), org.springblade.core.tool.utils.DateUtil.format(now, "yyyy-MM-dd HH:mm:ss")));
- flowEntity.setOperator(AuthUtil.getUserName());
+ flowEntity.setFlowDesc(newStatusEnum.getDesc());
+ flowEntity.setOperator(AuthUtil.getNickName());
flowEntity.setType(WorkOrderTypeEnum.WORK_ORDER_TASK.getValue());
+ flowEntity.setFlowStatus(newStatusEnum.getMaxCode());
+ flowEntity.setWorkStatus(newStatusEnum.getCode());
flowEntity.setAreaCode(entity.getAreaCode());
flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
return gdWorkOrderFlowService.save(flowEntity);
@@ -243,26 +239,30 @@
}
boolean updateResult = updateById(workOrder);
- // 5. 保存流转记录
+ // 5. 把待验收的都改为待签收状态
+ if (operationType == 10) {
+ return gdPatrolTaskService.update(Wrappers.<GdPatrolTaskEntity>lambdaUpdate()
+ .set(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.PENDING_SIGNING.getValue())
+ .eq(GdPatrolTaskEntity::getWorkOrderId, workOrder.getId())
+ .in(GdPatrolTaskEntity::getTaskStatus,
+ PatrolTaskStatusEnum.AUDIT_PASSED.getValue(),
+ PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue())
+ );
+ }
+ // 6. 保存流转记录
if (updateResult) {
GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
flowEntity.setCreateUser(AuthUtil.getUserId());
flowEntity.setWorkOrderId(workOrder.getId());
flowEntity.setFlowName(newStatusEnum.getStageDesc());
- flowEntity.setFlowDesc(String.format("%s %s", AuthUtil.getUserName(), org.springblade.core.tool.utils.DateUtil.format(now, CommonConstant.YYYY_MM_DD_HH_MM_SS)));
- flowEntity.setOperator(AuthUtil.getUserName());
+ flowEntity.setFlowDesc(newStatusEnum.getDesc());
+ flowEntity.setOperator(AuthUtil.getNickName());
flowEntity.setType(WorkOrderTypeEnum.WORK_ORDER_TASK.getValue());
+ flowEntity.setFlowStatus(newStatusEnum.getMaxCode());
+ flowEntity.setWorkStatus(newStatusEnum.getCode());
flowEntity.setAreaCode(workOrder.getAreaCode());
flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
return gdWorkOrderFlowService.save(flowEntity);
- }
- // 6. 把待验收的都改为待签收状态
- if (operationType == 10) {
- boolean update = gdPatrolTaskService.update(Wrappers.<GdPatrolTaskEntity>lambdaUpdate()
- .set(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.PENDING_SIGNING.getValue())
- .eq(GdPatrolTaskEntity::getWorkOrderId, workOrder.getId())
- .eq(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue())
- );
}
return false;
--
Gitblit v1.9.3