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 | 93 ++++++++++++++++++++++++++++++----------------
1 files changed, 61 insertions(+), 32 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 85bb990..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,5 +1,6 @@
package org.sxkj.gd.workorder.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -29,10 +30,11 @@
import org.sxkj.gd.workorder.service.IGdWorkOrderFlowService;
import org.sxkj.gd.workorder.service.IGdWorkOrderService;
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;
/**
* 工单任务表 服务实现类
@@ -55,6 +57,13 @@
@Override
public IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, WorkOrderPageParam gdWorkOrder) {
+ if (gdWorkOrder.getIsQueryAll()) {
+ 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));
}
@@ -94,27 +103,29 @@
}
// 保存操作
- Integer saveResult;
+ Boolean saveResult;
Date now = new Date();
+ WorkOrderStatusEnum newStatusEnum = WorkOrderStatusEnum.PUBLISHING_ACCEPTING;
if (entity.getId() != null) {
// 更新操作
entity.setUpdateUser(AuthUtil.getUserId());
entity.setUpdateTime(now);
-
// 状态转换：拒绝状态修改后自动转换为待处理状态
switch (entity.getWorkOrderStatus()) {
case "11": // 发布中_拒绝接单 → 发布中_接单中
entity.setWorkOrderStatus(WorkOrderStatusEnum.PUBLISHING_ACCEPTING.getCode());
- break;
- case "24": // 响应中_拒绝取消 → 响应中_申请取消
- entity.setWorkOrderStatus(WorkOrderStatusEnum.RESPONDING_APPLY_CANCEL.getCode());
+ newStatusEnum = WorkOrderStatusEnum.PUBLISHING_ACCEPTING;
break;
case "20": // 响应中_待拆分 → 响应中_申请修改
- case "25": // 响应中_拒绝修改 → 响应中_申请修改
entity.setWorkOrderStatus(WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY.getCode());
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY;
+ // 生成快照
+ GdWorkOrderEntity orderEntity = baseMapper.getWorkOrderByIdWithoutGeom(entity.getId());
+ // 直接生成快照，无需处理geom字段
+ entity.setFullSnapshot(JSON.toJSONString(orderEntity));
break;
}
- saveResult = baseMapper.updateWorkOrderById(entity);
+ saveResult = updateById(entity);
} else {
// 新增操作
entity.setCreateUser(AuthUtil.getUserId());
@@ -122,19 +133,21 @@
entity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
entity.setStatus(1);
entity.setIsDeleted(0);
- saveResult = baseMapper.saveWorkOrder(entity);
+ saveResult = save(entity);
}
// 保存成功则保存流转记录
- if (saveResult > 0) {
+ if (saveResult) {
// 构建并保存流转记录
GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
flowEntity.setCreateUser(AuthUtil.getUserId());
flowEntity.setWorkOrderId(entity.getId());
- flowEntity.setFlowName(WorkOrderStatusEnum.STAGE_WORK_ORDER_RELEASE.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.setFlowName(newStatusEnum.getStageDesc());
+ 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);
@@ -164,7 +177,7 @@
if (currentStatus == null || !currentStatus.isAllowedOperation(operationType)) {
return false;
}
- // 1接单，2拒接接单，3申请取消，4申请修改， 5同意取消 6不同意取消 7.同意修改 8.不同意修改 9.协商修改 10.同意修改
+ // 1接单，2拒接接单，3申请取消，4申请修改， 5同意取消 6不同意取消 7.同意修改 8.不同意修改 9.协商修改 10.同意修改 11.结算
// 3. 确定新状态和流转名称
WorkOrderStatusEnum newStatusEnum;
switch (operationType) {
@@ -188,10 +201,10 @@
workOrder.setServiceParty(AuthUtil.getNickName());
break;
case 6: // 不同意取消
- newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_CANCEL;
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT;
break;
case 8: // 不同意修改
- newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_MODIFY;
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT;
workOrder.setServiceParty(AuthUtil.getNickName());
break;
case 9: // 协商修改 --> 协商修改
@@ -201,39 +214,55 @@
case 10: // 同意协商修改 --> 待拆分
newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT;
break;
+ case 11: // 结算 --> 结算完成
+ newStatusEnum = WorkOrderStatusEnum.SETTLEMENT_COMPLETED;
+ break;
default: // 无效操作类型
return false;
}
// 4. 更新工单状态
Date now = new Date();
- workOrder.setWorkOrderStatus(newStatusEnum.getCode());
- workOrder.setUpdateUser(AuthUtil.getUserId());
- workOrder.setGeom(null);
- workOrder.setUpdateTime(now);
- workOrder.setRejectReason(statusParam.getRejectReason());
+ if (operationType == 8) {
+ // 不同意修改，需要把快照回滚
+ GdWorkOrderEntity snapshotEntity = (GdWorkOrderEntity) JSON.parseObject(workOrder.getFullSnapshot(), GdWorkOrderEntity.class);
+ snapshotEntity.setId(workOrder.getId()); // 保持原ID
+ snapshotEntity.setUpdateUser(AuthUtil.getUserId());
+ snapshotEntity.setUpdateTime(now);
+ workOrder = snapshotEntity;
+ } else {
+ workOrder.setWorkOrderStatus(newStatusEnum.getCode());
+ workOrder.setUpdateUser(AuthUtil.getUserId());
+ workOrder.setUpdateTime(now);
+ workOrder.setGeom(null);
+ workOrder.setRejectReason(statusParam.getRejectReason());
+ }
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