面试登记导出修改

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/hpinterview/service/HpInterviewRegisterService.java

@@ -111,25 +111,22 @@ public class HpInterviewRegisterService extends CrudService<HpInterviewRegisterM
         cell = row.createCell(3);
         cell.setCellValue("身份证号");
         cell.setCellStyle(style);
-        String registerInformation=list.get(0).getRegisterInformation();
+        List<String> list1=new ArrayList<>();
         //创建不固定字段表头列
-        for (int i = 1; i <list.size() ; i++) {
-            if(registerInformation.length()<list.get(i).getRegisterInformation().length()){
-                registerInformation=list.get(i).getRegisterInformation();
+        for (int i = 0; i <list.size() ; i++) {
+            JSONArray jsonArray=JSONArray.parseArray(list.get(i).getRegisterInformation());
+            for (int j = 0; j <jsonArray.size() ; j++) {
+                if(!list1.contains(jsonArray.getJSONObject(j).get("name").toString())){
+                    list1.add(jsonArray.getJSONObject(j).get("name").toString());
+                }
             }
         }
-        JSONArray jsonArray=JSONArray.parseArray(registerInformation);
-        List<Map> list1=new ArrayList<>();
-        for (int i = 0; i <jsonArray.size() ; i++) {
+        for (int i = 0; i <list1.size() ; i++) {
             cell = row.createCell(4+i);
-            cell.setCellValue(jsonArray.getJSONObject(i).get("name").toString());
+            cell.setCellValue(list1.get(i));
             cell.setCellStyle(style);
-            Map map=new HashMap();
-            map.put("name",jsonArray.getJSONObject(i).get("name").toString());
-            map.put("value",jsonArray.getJSONObject(i).get("value").toString());
-            list1.add(map);
         }
-        cell = row.createCell(4 + jsonArray.size());
+        cell = row.createCell(4 + list1.size());
         cell.setCellValue("登记时间");
         cell.setCellStyle(style);
         //创建内容
@@ -139,18 +136,18 @@ public class HpInterviewRegisterService extends CrudService<HpInterviewRegisterM
             //将内容按顺序赋给对应的列对象
             row.createCell(0).setCellValue(list.get(i).getName());
             row.createCell(1).setCellValue(list.get(i).getPhone());
-            row.createCell(2).setCellValue(list.get(i).getGender());
+            row.createCell(2).setCellValue(DictUtils.getDictLabel(list.get(i).getGender(), "gender", ""));
             row.createCell(3).setCellValue(list.get(i).getIdcardNumber());
             JSONArray jsonArray1 = JSONArray.parseArray(list.get(i).getRegisterInformation());
             for (int j = 0; j < list1.size(); j++) {
                 for (int k = 0; k < jsonArray1.size(); k++) {
-                    if (list1.get(j).get("name").equals(jsonArray1.getJSONObject(k).get("name").toString())) {
-                        row.createCell(4 + j).setCellValue(list1.get(j).get("value").toString());
+                    if (list1.get(j).equals(jsonArray1.getJSONObject(k).get("name").toString())) {
+                        row.createCell(4 + j).setCellValue(jsonArray1.getJSONObject(k).get("value").toString());
                         break;
                     }
                 }
             }
-            row.createCell(4 + jsonArray.size()).setCellValue(datetimeFormat.get().format(list.get(i).getRegisterTime()));
+            row.createCell(4 + list1.size()).setCellValue(datetimeFormat.get().format(list.get(i).getRegisterTime()));
         }
         return wb;
     }