From 3256e5b0e65a438e48aea99bc7e57d875fe28eaf Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 23 Sep 2021 17:44:05 +0800
Subject: [PATCH] orgName

---
 .../epmettduck/result/TDuckListResultDTO.java |  8 +++++++
 .../impl/PrUserProjectServiceImpl.java        | 24 +++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
index 267df6a5f2..0874011bce 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
@@ -79,6 +79,13 @@ public class TDuckListResultDTO implements Serializable {
      */
     private Integer recycled;
 
+    /**
+     * 组织名
+     */
+    private String orgName;
+
+    private String createdBy;
+
     public TDuckListResultDTO() {
         this.customerId = "";
         this.key = "";
@@ -92,5 +99,6 @@ public class TDuckListResultDTO implements Serializable {
         this.client = "";
         this.createdTime = "";
         this.fillStatus = false;
+        this.orgName = "";
     }
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 2d187fdd59..19815e12b1 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -217,6 +217,30 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                 }
             }
         }
+        result.forEach(r -> {
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), r.getCreatedBy());
+            String orgName = "";
+            if (null != staffInfo){
+                if (staffInfo.getFromOrgType().equals(TDuckConstant.ORG_TYPE_AGENCY)){
+                    orgName = staffInfo.getAgencyName();
+                }else if (staffInfo.getFromOrgType().equals(TDuckConstant.ORG_TYPE_GRID)){
+                    for (IdAndNameDTO g : staffInfo.getGridList()) {
+                        if (g.getId().equals(staffInfo.getFromOrgId())){
+                            orgName = g.getName();
+                            continue;
+                        }
+                    }
+                }else if (staffInfo.getFromOrgType().equals(TDuckConstant.ORG_TYPE_DEPT)){
+                    for (IdAndNameDTO d : staffInfo.getDeptList()) {
+                        if (d.getId().equals(staffInfo.getFromOrgId())){
+                            orgName = d.getName();
+                            continue;
+                        }
+                    }
+                }
+            }
+            r.setOrgName(orgName);
+        });
         return result;
     }