From 136e4453ce9ed45c4c2e66b86c74b5cce271e01f Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Thu, 14 Jul 2022 11:08:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AE=B0=E5=BD=95=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=94=B3=E8=AF=B7=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/renren/modules/activiti/dto/ProcessInstanceDTO.java  | 3 +++
 .../renren/modules/activiti/service/ActHistoryService.java  | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/dto/ProcessInstanceDTO.java b/renren-admin/src/main/java/io/renren/modules/activiti/dto/ProcessInstanceDTO.java
index 1bacdbc4..a6320d0a 100644
--- a/renren-admin/src/main/java/io/renren/modules/activiti/dto/ProcessInstanceDTO.java
+++ b/renren-admin/src/main/java/io/renren/modules/activiti/dto/ProcessInstanceDTO.java
@@ -88,4 +88,7 @@ public class ProcessInstanceDTO {
     private Integer demandCommentFlag;
     @ApiModelProperty(value = "评论情况")
     private String demandCommentFlagTip;
+
+    @ApiModelProperty(value = "申请单号")
+    private String applyNumber;
 }
diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java
index 07120ed4..d805e486 100644
--- a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java
+++ b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java
@@ -289,12 +289,14 @@ public class ActHistoryService {
                     stringBuffer.deleteCharAt(stringBuffer.length() - 1);
                     dto.setName(stringBuffer.toString());
                     dto.setResourceId(null);
+                    dto.setApplyNumber(abilityApplicationDTO.get(0).getApplyNumber());
                 }
             } else {
                 TAbilityApplicationDTO abilityApplicationDTO1 = tAbilityApplicationService.getByBusinessKey(dto.getBusinessKey());
                 if (abilityApplicationDTO1 != null) {
                     dto.setName(abilityApplicationDTO1.getSystem());
                     dto.setResourceId(abilityApplicationDTO1.getResourceId());
+                    dto.setApplyNumber(abilityApplicationDTO1.getApplyNumber());
                 } else {
                     TResourceMountApplyDTO resourceMountApplyDTO = tResourceMountApplyService.get(Long.valueOf(dto.getBusinessKey()));
                     if (resourceMountApplyDTO != null && resourceMountApplyDTO.getResourceDTO() != null
@@ -306,6 +308,7 @@ public class ActHistoryService {
                             if (resourceDTO != null) {
                                 dto.setName(resourceDTO.getName());
                                 dto.setResourceId(resourceDTO.getId().toString());
+                                dto.setApplyNumber(resourceMountApplyDTO.getApplyNumber());
                             }
                         }
                     } else {
@@ -313,6 +316,7 @@ public class ActHistoryService {
                         if (resourceDTO != null) {
                             dto.setName(resourceDTO.getName());
                             dto.setResourceId(resourceDTO.getId().toString());
+                            dto.setApplyNumber(resourceDTO.getApplyNumber());
                         } else {
                             TDemandCommentDTO tDemandCommentDTO = tDemandCommentService.get(Long.valueOf(dto.getBusinessKey()));
                             if (tDemandCommentDTO != null) {
@@ -323,6 +327,7 @@ public class ActHistoryService {
                                 if (tDemandCommentEntityDelFlag.isPresent()) {
                                     dto.setDemandCommentFlagTip(tDemandCommentEntityDelFlag.get().getTip());
                                 }
+                                dto.setApplyNumber(tDemandCommentDTO.getApplyNumber());
                             } else {
                                 TDemandDataDTO tDemandDataDTO = tDemandDataService.get(Long.valueOf(dto.getBusinessKey()));
                                 if (tDemandDataDTO != null) {
@@ -333,6 +338,7 @@ public class ActHistoryService {
                                     if (tDemandCommentEntityDelFlag.isPresent()) {
                                         dto.setDemandFlagTip(tDemandCommentEntityDelFlag.get().getTip());
                                     }
+                                    dto.setApplyNumber(tDemandDataDTO.getApplyNumber());
                                 }
                             }
                         }