From 6d1603aeb241657a924d39a8cf725d1e9bfa148d Mon Sep 17 00:00:00 2001
From: Mlin <ml123456>
Date: Tue, 3 Jan 2023 11:41:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=80=E5=8E=86=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E5=AF=BC=E5=87=BA20230103?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PersonnelResumeServiceImpl.java      | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
index 66a47132..2f78250d 100644
--- a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
+++ b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
@@ -179,21 +179,27 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
 
         // 初始化数据map
         Map<String,Object> dataMap = new HashMap<>();
+        dataMap = getResumeList(23);
 
-        // 录入采购基本数据
-        dataMap.put("data1", "XX公司");
-        dataMap.put("data2", "XX项目");
-        dataMap.put("data3", "2022.01.01");
-        dataMap.put("data4", "采购部");
-        dataMap.put("data5", "张三");
-        dataMap.put("data6", "189XXXXXXX");
-        dataMap.put("data7", "李四");
-        dataMap.put("data8", "张主任");
-        dataMap.put("data9", "王总");
-        dataMap.put("data10", "王某");
-        dataMap.put("data11", "王某");
-        dataMap.put("data12", "张三");
+//        Object tables = dataMap.get("tables");
+//        System.out.println(tables);
+        if (dataMap.containsKey("tables")){
+            List<PersonnelResumeTable> tables =  (List<PersonnelResumeTable>) dataMap.get("tables");
 
+            for (int t=0;t<tables.size();t++){
+                PersonnelResumeTable personnelResumeTable = tables.get(t);
+                int length = personnelResumeTable.getColumns().size();
+                if(personnelResumeTable.getDatas().size()>0){
+                    List<List<PersonnelResumeColumn>> datas = personnelResumeTable.getDatas();
+                    if (datas.size()>0){
+                        List<PersonnelResumeColumn> dataList = datas.get(0);
+                        for (int i=0;i<length;i++){
+                            dataMap.put("col"+t + i,dataList.get(i).getValue());
+                        }
+                    }
+                }
+            }
+        }
 
         // 录入表格数据(3条数据循环三次)
         for (int i = 1; i <= 3; i++) {