From 58f525c949a3adcff5b8ea603f0c4b53597aeaa5 Mon Sep 17 00:00:00 2001
From: wangqian <1406304305@qq.com>
Date: Thu, 25 Dec 2025 10:15:59 +0800
Subject: [PATCH] 增加工单审批状态

---
 urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/api/task/BpmTaskApiImpl.java                      | 5 +++--
 urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/api/task/dto/BpmUserSimpleReqDTO.java             | 2 ++
 urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/api/task/BpmTaskApiImpl.java b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/api/task/BpmTaskApiImpl.java
index ce7bbc1..f857c37 100644
--- a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/api/task/BpmTaskApiImpl.java
+++ b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/api/task/BpmTaskApiImpl.java
@@ -2,9 +2,8 @@ package com.zteits.urbanops.module.bpm.api.task;
 
 import cn.hutool.core.collection.CollUtil;
 import com.zteits.urbanops.framework.common.util.number.NumberUtils;
-import com.zteits.urbanops.framework.common.util.object.BeanUtils;
 import com.zteits.urbanops.module.bpm.api.task.dto.BpmUserSimpleReqDTO;
-import com.zteits.urbanops.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO;
+import com.zteits.urbanops.module.bpm.framework.flowable.core.util.FlowableUtils;
 import com.zteits.urbanops.module.bpm.service.task.BpmTaskService;
 import com.zteits.urbanops.module.system.api.user.AdminUserApi;
 import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO;
@@ -103,6 +102,8 @@ public class BpmTaskApiImpl implements BpmTaskApi{
                     taskVO.setAssigneeName(assignUser.getNickname());
                 }
             }
+            Integer taskStatus = FlowableUtils.getTaskStatus(lastTask);
+            taskVO.setTaskStatus(taskStatus);
             resultMap.put(processId, taskVO);
         }
         return resultMap;
diff --git a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/api/task/dto/BpmUserSimpleReqDTO.java b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/api/task/dto/BpmUserSimpleReqDTO.java
index 75d0ad2..d9d3009 100644
--- a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/api/task/dto/BpmUserSimpleReqDTO.java
+++ b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/api/task/dto/BpmUserSimpleReqDTO.java
@@ -16,4 +16,6 @@ public class BpmUserSimpleReqDTO {
     private Long assignee;
     /*处理人名称*/
     private String assigneeName;
+    /*审批状态*/
+    private Integer taskStatus;
 }
diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java
index e9594b2..4d282cc 100644
--- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java
+++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java
@@ -44,6 +44,7 @@ public interface MainInfoConvert {
                     if (bpmUserSimpleReqDTO != null) {
                         mainInfoVo.setAssigneeName(bpmUserSimpleReqDTO.getAssigneeName());
                         mainInfoVo.setApprovalNode(bpmUserSimpleReqDTO.getName());
+                        mainInfoVo.setStatus(bpmUserSimpleReqDTO.getTaskStatus());
                     }
                 }
             }
--
libgit2 0.21.4