导出优化

src/main/java/com/yunzhi/marketing/excel/searchHouse/AddedValue.java

@@ -23,7 +23,7 @@ public class AddedValue {
 
     @ColumnWidth(15)
     @ExcelProperty(value = "意向区域", index = 3)
-    private String intentArea;
+    private String name;
 
 
     @ColumnWidth(15)

src/main/java/com/yunzhi/marketing/excel/searchHouse/BuyRoom.java

@@ -26,7 +26,7 @@ public class BuyRoom {
 
     @ColumnWidth(15)
     @ExcelProperty(value = "意向区域", index = 3)
-    private String intentArea;
+    private String name;
 
 
     @ColumnWidth(15)

src/main/java/com/yunzhi/marketing/excel/searchHouse/Overseas.java

@@ -24,7 +24,7 @@ public class Overseas {
 
     @ColumnWidth(15)
     @ExcelProperty(value = "意向区域", index = 3)
-    private String intentArea;
+    private String name;
 
 
     @ColumnWidth(15)

src/main/java/com/yunzhi/marketing/excel/searchHouse/Rent.java

@@ -24,7 +24,7 @@ public class Rent {
 
     @ColumnWidth(15)
     @ExcelProperty(value = "意向区域", index = 3)
-    private String intentArea;
+    private String name;
 
 
     @ColumnWidth(15)

src/main/java/com/yunzhi/marketing/xlk/controller/SearchHouseController.java

@@ -145,6 +145,10 @@ public class SearchHouseController extends BaseController {
                 AddedValue addedValue = new AddedValue();
                 String format = formatter.format(e.getCreatedTime());
                 addedValue.setCreatedTime(format);
+                e.setGender("未知");
+                if (StringUtils.isEmpty(e.getGender())) {
+                    e.setGender(e.getGender().equals("1") ? "男" : e.getGender().equals("2") ? "女" : "未知");
+                }
                 BeanUtils.copyProperties(e,addedValue);
                 list.add(addedValue);
             });
@@ -160,6 +164,11 @@ public class SearchHouseController extends BaseController {
                 BuyRoom buyRoom = new BuyRoom();
                 String format = formatter.format(e.getCreatedTime());
                 buyRoom.setCreatedTime(format);
+                e.setGender("未知");
+                if (StringUtils.isEmpty(e.getGender())) {
+                    e.setGender(e.getGender().equals("1") ? "男" : e.getGender().equals("2") ? "女" : "未知");
+                }
+
                 BeanUtils.copyProperties(e,buyRoom);
                 list.add(buyRoom);
             });
@@ -175,6 +184,10 @@ public class SearchHouseController extends BaseController {
                 Overseas overseas = new Overseas();
                 String format = formatter.format(e.getCreatedTime());
                 overseas.setCreatedTime(format);
+                e.setGender("未知");
+                if (StringUtils.isEmpty(e.getGender())) {
+                    e.setGender(e.getGender().equals("1") ? "男" : e.getGender().equals("2") ? "女" : "未知");
+                }
                 BeanUtils.copyProperties(e,overseas);
                 list.add(overseas);
             });
@@ -190,6 +203,10 @@ public class SearchHouseController extends BaseController {
                 Rent rent = new Rent();
                 String format = formatter.format(e.getCreatedTime());
                 rent.setCreatedTime(format);
+                e.setGender("未知");
+                if (StringUtils.isEmpty(e.getGender())) {
+                    e.setGender(e.getGender().equals("1") ? "男" : e.getGender().equals("2") ? "女" : "未知");
+                }
                 BeanUtils.copyProperties(e,rent);
                 list.add(rent);
             });

src/main/java/com/yunzhi/marketing/xlk/service/impl/SearchHouseServiceImpl.java

@@ -170,6 +170,10 @@ public class SearchHouseServiceImpl extends ServiceImpl<SearchHouseMapper, Searc
                             result = resultId;
                         }
                     }
+                    if ("purpose".equals(name)|| "advantage".equals(name)|| "facility".equals(name)|| "important".equals(name)||
+                    "style".equals(name)|| "mostImportant".equals(name)|| "special".equals(name)) {
+                        result = result.replace("[","").replace("]","");
+                    }
                     method.invoke(e,result);
                 } catch (Exception ex) {
                     ex.printStackTrace();