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/GdPatrolTaskServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
index e6e6846..60ecfc4 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
@@ -16,14 +16,18 @@
*/
package org.sxkj.gd.workorder.service.impl;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
+import org.sxkj.common.constant.WordOrderConstant;
+import org.sxkj.common.utils.OrderNumUtils;
import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
import org.sxkj.gd.workorder.entity.GdWorkOrderFlowEntity;
import org.sxkj.gd.workorder.enums.PatrolTaskStatusEnum;
import org.sxkj.gd.workorder.enums.WorkOrderStatusEnum;
import org.sxkj.gd.workorder.enums.WorkOrderTypeEnum;
+import org.sxkj.gd.workorder.param.GdPatrolTaskPageParam;
import org.sxkj.gd.workorder.service.IGdWorkOrderFlowService;
import org.sxkj.gd.workorder.vo.GdPatrolTaskVO;
import org.sxkj.gd.workorder.excel.GdPatrolTaskExcel;
@@ -50,7 +54,7 @@
private IGdWorkOrderFlowService gdWorkOrderFlowService;
@Override
- public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskVO gdPatrolTask) {
+ public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask) {
return page.setRecords(baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask));
}
@@ -69,6 +73,12 @@
public boolean savePatrolTask(List<GdPatrolTaskEntity> taskEntityList) {
// 更新流程节点
for (GdPatrolTaskEntity gdPatrolTaskEntity : taskEntityList) {
+ // 生成巡查任务编号
+ if (StringUtils.isBlank(gdPatrolTaskEntity.getTaskNo())) {
+ // 使用时间戳生成唯一巡查任务编号
+ String timestamp = OrderNumUtils.initOrderNum(WordOrderConstant.PATROL_TASK_KEY);
+ gdPatrolTaskEntity.setTaskNo(WordOrderConstant.PATROL_TASK_PREFIX + timestamp);
+ }
// 保存巡逻任务
boolean save = save(gdPatrolTaskEntity);
if (!save) {
@@ -115,14 +125,14 @@
if (PatrolTaskStatusEnum.REJECTED_SIGNING.getValue().equals(auditStatus) && (rejectReason == null || rejectReason.trim().isEmpty())) {
throw new RuntimeException("拒绝签收时必须填写拒绝原因");
}
-
+
// 4. 检查其他需要拒绝原因的状态
if ((PatrolTaskStatusEnum.AUDIT_REJECTED.getValue().equals(auditStatus) || PatrolTaskStatusEnum.REJECTED_ACCEPTANCE.getValue().equals(auditStatus)) && (rejectReason == null || rejectReason.trim().isEmpty())) {
throw new RuntimeException("审核驳回或拒绝验收时必须填写拒绝原因");
}
// 4. 更新任务状态
- task.setTaskStatus(Byte.valueOf(auditStatus));
+ task.setTaskStatus(auditStatus);
boolean updateResult = updateById(task);
if (!updateResult) {
throw new RuntimeException("更新任务状态失败");
--
Gitblit v1.9.3