From cdc60b89add7a32ee458c4b9c27acfdf40fc14fd Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Tue, 20 Jan 2026 15:02:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java | 163 +++++++++++++++++++++++------------------------------
1 files changed, 71 insertions(+), 92 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 a89f39d..2e25613 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,19 +1,3 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
package org.sxkj.gd.workorder.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -87,53 +71,68 @@
@Override
@Transactional(rollbackFor = Exception.class)
public boolean saveOrUpdateWorkOrder(WorkOrderAddParam workOrderParam) {
- GdWorkOrderEntity entity = Objects.requireNonNull(BeanUtil.copy(workOrderParam, GdWorkOrderEntity.class));
+ // 参数转换
+ GdWorkOrderEntity entity = BeanUtil.copy(workOrderParam, GdWorkOrderEntity.class);
// 验证并格式化几何数据
- String geom = entity.getGeom();
- String validatedGeom = GeomUtils.validateAndFormatGeom(geom);
+ String validatedGeom = GeomUtils.validateAndFormatGeom(entity.getGeom());
if (validatedGeom == null) {
return false;
}
-
- // 设置验证后的几何数据
entity.setGeom(validatedGeom);
// 生成工单编号
if (StringUtils.isBlank(entity.getWorkOrderCode())) {
- // 使用时间戳生成唯一工单编号
String timestamp = OrderNumUtils.initOrderNum(WordOrderConstant.ORDER_REDIS_KEY);
entity.setWorkOrderCode(WordOrderConstant.ORDER_PREFIX + timestamp);
}
- Integer save = 0;
+
+ // 保存操作
+ Integer saveResult;
+ Date now = new Date();
if (entity.getId() != null) {
+ // 更新操作
entity.setUpdateUser(AuthUtil.getUserId());
- entity.setUpdateTime(new Date());
- save = baseMapper.updateWorkOrderById(entity);
+ entity.setUpdateTime(now);
+
+ // 状态转换：拒绝状态修改后自动转换为待处理状态
+ switch (entity.getWorkOrderStatus()) {
+ case "11": // 发布中_拒绝接单 → 发布中_接单中
+ entity.setWorkOrderStatus(WorkOrderStatusEnum.PUBLISHING_ACCEPTING.getCode());
+ break;
+ case "24": // 响应中_拒绝取消 → 响应中_申请取消
+ entity.setWorkOrderStatus(WorkOrderStatusEnum.RESPONDING_APPLY_CANCEL.getCode());
+ break;
+ case "25": // 响应中_拒绝修改 → 响应中_申请修改
+ entity.setWorkOrderStatus(WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY.getCode());
+ break;
+ }
+ saveResult = baseMapper.updateWorkOrderById(entity);
} else {
+ // 新增操作
entity.setCreateUser(AuthUtil.getUserId());
- entity.setCreateTime(new Date());
+ entity.setCreateTime(now);
entity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
entity.setStatus(1);
entity.setIsDeleted(0);
- save = baseMapper.saveWorkOrder(entity);
+ saveResult = baseMapper.saveWorkOrder(entity);
}
- // 保存成功
- if (save > 0) {
- // 保存流转记录
- GdWorkOrderFlowEntity gdWorkOrderFlowEntity = new GdWorkOrderFlowEntity();
- gdWorkOrderFlowEntity.setCreateUser(AuthUtil.getUserId());
- gdWorkOrderFlowEntity.setWorkOrderId(entity.getId());
- gdWorkOrderFlowEntity.setFlowName(WorkOrderStatusEnum.STAGE_WORK_ORDER_RELEASE.getStageDesc());
- gdWorkOrderFlowEntity.setFlowDesc(AuthUtil.getUserName() + " " + org.springblade.core.tool.utils.DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
- gdWorkOrderFlowEntity.setOperator(AuthUtil.getUserName());
- gdWorkOrderFlowEntity.setType(WorkOrderTypeEnum.WORK_ORDER_TASK.getValue());
- gdWorkOrderFlowEntity.setAreaCode(entity.getAreaCode());
- gdWorkOrderFlowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
- boolean save1 = gdWorkOrderFlowService.save(gdWorkOrderFlowEntity);
- return save1;
+ // 保存成功则保存流转记录
+ if (saveResult > 0) {
+ // 构建并保存流转记录
+ 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.setType(WorkOrderTypeEnum.WORK_ORDER_TASK.getValue());
+ flowEntity.setAreaCode(entity.getAreaCode());
+ flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+ return gdWorkOrderFlowService.save(flowEntity);
}
+
return false;
}
@@ -146,82 +145,62 @@
@Override
@Transactional(rollbackFor = Exception.class)
public boolean handleWorkOrderStatus(WorkOrderStatusParam statusParam) {
- // 获取工单信息
+ // 1. 获取工单信息
GdWorkOrderEntity workOrder = getById(statusParam.getWorkOrderId());
if (workOrder == null) {
return false;
}
- // 检查当前状态是否允许该操作类型
+ // 2. 状态权限校验
WorkOrderStatusEnum currentStatus = WorkOrderStatusEnum.getByCode(workOrder.getWorkOrderStatus());
- if (currentStatus == null || !currentStatus.isAllowedOperation(statusParam.getOperationType())) {
+ Integer operationType = statusParam.getOperationType();
+ if (currentStatus == null || !currentStatus.isAllowedOperation(operationType)) {
return false;
}
- // 操作类型：1接单，2拒接接单，3申请取消，4申请修改， 5同意取消 6不同意取消 7.同意修改 8.不同意修改
- Integer operationType = statusParam.getOperationType();
- String newStatus = null;
- String flowName = null;
-
- // 统一设置流转描述前缀
- String flowDesc = AuthUtil.getUserName() + " " + org.springblade.core.tool.utils.DateUtil.format(new Date(), CommonConstant.YYYY_MM_DD_HH_MM_SS);
-
+ // 3. 确定新状态和流转名称
+ WorkOrderStatusEnum newStatusEnum;
switch (operationType) {
- case 1:
- case 7:
- // 接单操作：更新状态为响应中_待拆分（20）
- newStatus = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT.getCode();
- flowName = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT.getStageDesc();
+ case 1: // 接单
+ case 7: // 同意修改
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT;
break;
- case 2:
- // 拒接接单操作：更新状态为发布中_拒绝接单（11）
- newStatus = WorkOrderStatusEnum.PUBLISHING_REJECTING.getCode();
- flowName = WorkOrderStatusEnum.PUBLISHING_REJECTING.getStageDesc();
+ case 2: // 拒接接单
+ newStatusEnum = WorkOrderStatusEnum.PUBLISHING_REJECTING;
break;
- case 3:
- // 申请取消操作：更新状态为响应中_申请取消（21）
- newStatus = WorkOrderStatusEnum.RESPONDING_APPLY_CANCEL.getCode();
- flowName = WorkOrderStatusEnum.RESPONDING_APPLY_CANCEL.getStageDesc();
+ case 3: // 申请取消
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_APPLY_CANCEL;
break;
- case 4:
- // 申请修改操作：更新状态为响应中_申请修改（22）
- newStatus = WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY.getCode();
- flowName = WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY.getStageDesc();
+ case 4: // 申请修改
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY;
break;
- case 5:
- // 已取消操作：更新状态为响应中_已取消（23）
- newStatus = WorkOrderStatusEnum.RESPONDING_CANCELED.getCode();
- flowName = WorkOrderStatusEnum.RESPONDING_CANCELED.getStageDesc();
+ case 5: // 同意取消
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_CANCELED;
break;
- case 6:
- // 已取消操作：更新状态为响应中_已取消（24）
- newStatus = WorkOrderStatusEnum.RESPONDING_REJECT_CANCEL.getCode();
- flowName = WorkOrderStatusEnum.RESPONDING_REJECT_CANCEL.getStageDesc();
+ case 6: // 不同意取消
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_CANCEL;
break;
- case 8:
- // 已取消操作：更新状态为响应中_已取消（25）
- newStatus = WorkOrderStatusEnum.RESPONDING_REJECT_MODIFY.getCode();
- flowName = WorkOrderStatusEnum.RESPONDING_REJECT_MODIFY.getStageDesc();
+ case 8: // 不同意修改
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_MODIFY;
break;
- default:
- // 无效的操作类型
+ default: // 无效操作类型
return false;
}
- // 更新工单状态
- workOrder.setWorkOrderStatus(newStatus);
+ // 4. 更新工单状态
+ Date now = new Date();
+ workOrder.setWorkOrderStatus(newStatusEnum.getCode());
workOrder.setUpdateUser(AuthUtil.getUserId());
- workOrder.setUpdateTime(new Date());
- workOrder.setGeom(null);
- boolean update = updateById(workOrder);
+ workOrder.setUpdateTime(now);
+ boolean updateResult = updateById(workOrder);
- // 更新成功，保存流转记录
- if (update) {
+ // 5. 保存流转记录
+ if (updateResult) {
GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
flowEntity.setCreateUser(AuthUtil.getUserId());
flowEntity.setWorkOrderId(workOrder.getId());
- flowEntity.setFlowName(flowName);
- flowEntity.setFlowDesc(flowDesc);
+ 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.setType(WorkOrderTypeEnum.WORK_ORDER_TASK.getValue());
flowEntity.setAreaCode(workOrder.getAreaCode());
--
Gitblit v1.9.3