From c23f42d3d9cb49fbf67cf58a9ada9729d7924403 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 19 Jan 2026 18:33:14 +0800
Subject: [PATCH] 工单新增
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 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 4ab8fd3..75bdb51 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
@@ -72,7 +72,7 @@
@Override
public List<GdWorkOrderExcel> exportGdWorkOrder(Wrapper<GdWorkOrderEntity> queryWrapper) {
List<GdWorkOrderExcel> gdWorkOrderList = baseMapper.exportGdWorkOrder(queryWrapper);
- //gdWorkOrderList.forEach(gdWorkOrder -> {
+ // gdWorkOrderList.forEach(gdWorkOrder -> {
// gdWorkOrder.setTypeName(DictCache.getValue(DictEnum.YES_NO, GdWorkOrder.getType()));
//});
return gdWorkOrderList;
@@ -80,12 +80,13 @@
/**
* 保存工单任务表
+ *
* @param workOrderParam
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean saveWorkOrder(WorkOrderAddParam workOrderParam) {
+ public boolean saveOrUpdateWorkOrder(WorkOrderAddParam workOrderParam) {
GdWorkOrderEntity entity = Objects.requireNonNull(BeanUtil.copy(workOrderParam, GdWorkOrderEntity.class));
// 验证并格式化几何数据
@@ -104,11 +105,21 @@
String timestamp = OrderNumUtils.initOrderNum(WordOrderConstant.ORDER_REDIS_KEY);
entity.setWorkOrderCode(WordOrderConstant.ORDER_PREFIX + timestamp);
}
- entity.setCreateUser(AuthUtil.getUserId());
- entity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
- boolean save = save(entity);
+ Integer save = 0;
+ if (entity.getId() != null) {
+ entity.setUpdateUser(AuthUtil.getUserId());
+ entity.setUpdateTime(new Date());
+ save = baseMapper.updateWorkOrderById(entity);
+ } else {
+ entity.setCreateUser(AuthUtil.getUserId());
+ entity.setCreateTime(new Date());
+ entity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+ entity.setStatus(1);
+ entity.setIsDeleted(0);
+ save = baseMapper.saveWorkOrder(entity);
+ }
// 保存成功
- if (save){
+ if (save > 0) {
// 保存流转记录
GdWorkOrderFlowEntity gdWorkOrderFlowEntity = new GdWorkOrderFlowEntity();
gdWorkOrderFlowEntity.setCreateUser(AuthUtil.getUserId());
@@ -128,6 +139,7 @@
/**
* 处理工单状态变更（接单或拒接接单）
+ *
* @param statusParam
* @return
*/
@@ -160,7 +172,7 @@
// 拒接接单操作：更新状态为发布中_拒绝接单（11）
newStatus = WorkOrderStatusEnum.PUBLISHING_REJECTING.getCode();
flowName = WorkOrderStatusEnum.PUBLISHING_REJECTING.getStageDesc();
- flowDesc = AuthUtil.getUserName() + " " + org.springblade.core.tool.utils.DateUtil.format(new Date(), CommonConstant.YYYY_MM_DD_HH_MM_SS) ;
+ flowDesc = AuthUtil.getUserName() + " " + org.springblade.core.tool.utils.DateUtil.format(new Date(), CommonConstant.YYYY_MM_DD_HH_MM_SS);
} else {
// 无效的操作类型
return false;
@@ -170,6 +182,7 @@
workOrder.setWorkOrderStatus(newStatus);
workOrder.setUpdateUser(AuthUtil.getUserId());
workOrder.setUpdateTime(new Date());
+ workOrder.setGeom(null);
boolean update = updateById(workOrder);
// 更新成功，保存流转记录
--
Gitblit v1.9.3