From 4e0f44fdbfa1e481c69e64add56007138518af9b Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Wed, 2 Dec 2020 15:32:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DgApplyAmountInfoController.java          | 40 +++++--------------
 1 file changed, 9 insertions(+), 31 deletions(-)

diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java
index 3e0ed24c..a21280cd 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java
@@ -44,10 +44,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * <p>
@@ -197,38 +194,19 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
                 }
                 //根据提单人id查询其部门名称
                 ResponseResult responseResult = hrmsFeignService.getAccountAndDeptNameById(arr);
-                List<EmployeeMessageResponse> employeeMessage = null;
+                List<LinkedHashMap> employeeMessage = null;
                 if(responseResult.getData() != null){
-                    employeeMessage = (List<EmployeeMessageResponse>) responseResult.getData();
+                    employeeMessage = (List<LinkedHashMap>) responseResult.getData();
                 }
-                System.out.println("employeeMessage============"+employeeMessage);
-                List<String> empList = new ArrayList<>();
-                for (EmployeeMessageResponse resq : employeeMessage) {
-                    empList.add(resq.getId().toString());
-                }
-
- /*               List<String> strList = new ArrayList<>();
-                String temp = null;
-                for (int n=0; n<list.size(); n++){
-                    temp = list.get(n).getPresenterId().toString();
-                }
-                if(empList.contains(temp)){
-                    strList.add(temp);
-                }
-                System.out.println("strList=============="+strList);*/
-                //int i=0;
-
-             //List<EmployeeMessageResponse> employeelist = JSONObject.parseArray(employeeMessage,EmployeeMessageResponse.class);
 
-/*                for (BusinessApplicationListResponse response:list) {
-                    for(EmployeeMessageResponse res : employeelist){
-                        if(response.getPresenterId().equals(res.getId())){//如果提单人id相同情况下，就往对象里面赋值
-                            response.setAccount(res.getAccount());
-                            response.setDeptName(res.getDeptName());
+                for (BusinessApplicationListResponse response:list) {
+                    for(LinkedHashMap res : employeeMessage){
+                        if(response.getPresenterId().equals(res.get("id"))){//如果提单人id相同情况下，就往对象里面赋值
+                            response.setAccount(JSONObject.toJSONString(res.get("account")));
+                            response.setDeptName(JSONObject.toJSONString(res.get("deptName")));
                         }
                     }
-                   // i++;
-                }*/
+                }
             }
         }
         return new ResponseResult<PageUtils>().SUCCESS(data);