仓库导出

src/main/java/com/boco/nbd/wios/export/Contants.java

@@ -63,9 +63,9 @@ public class Contants {
 
     public static final String export_warrantyOrder_field = "no,orderId,userName,userPhone,wallboxNo,startTimeStr,endTimeStr";
 
-    public static final String export_wareHouse_title = "仓库名称,仓库级别,所属区域,仓库归属,所属服务商,描述";
+    public static final String export_wareHouse_title = "仓库ID,仓库名称,仓库等级ID,仓库归属,区域,安装服务商";
 
-    public static final String export_wareHouse_field = "name,pathName,areaName,attributionName,providerName,msg";
+    public static final String export_wareHouse_field = "id,name,warehouseLevenId,warehouseAttribution,area,serviceProvider";
 
     public static final String export_single_title = "调拨单号,创建时间,创建人,说明,调拨类型,调入仓库,调出仓库";
 

src/main/java/com/boco/nbd/wios/export/ExportController.java

@@ -107,9 +107,11 @@ public class ExportController {
         String fieldStr = field.get(contants).toString();
         Field title = Contants.class.getDeclaredField("export_" + serviceName + "_title");
         String titleStr = title.get(contants).toString();
-        String[][] titleArray;
-        String scoreSupplier = "score_supplier";
-        if (scoreSupplier.equals(serviceName)) {
+
+        // String[] titleArray = "score_supplier".equals(serviceName) ? scoreConfigService.getExcelTitles() :
+        // titleStr.split(",");
+        String[][] titleArray = null;
+        if ("score_supplier".equals(serviceName)) {
             String[] excelTitles = scoreConfigService.getExcelTitles();
             titleArray = new String[2][excelTitles.length];
             titleArray[0] = excelTitles;
@@ -117,10 +119,10 @@ public class ExportController {
             newArr[5] = "总分";
             titleArray[1] = newArr;
         } else {
-            titleArray = new String[][]{titleStr.split(CamsConstant.COMMA)};
+            titleArray = new String[][]{titleStr.split(",")};
         }
 
-        String[] fieldStrArray = fieldStr.split(CamsConstant.COMMA);
+        String[] fieldStrArray = fieldStr.split(",");
         List<?> exportList = export.getExportList(searchJson);
         PoiUtil.exportExcelToWebsite(response, fileName, titleArray, fieldStrArray, exportList);
 

src/main/java/com/boco/nbd/wios/export/impl/WarehouseExport.java

@@ -21,42 +21,21 @@ import java.util.Map;
  * @version [版本号, 2020年10月28日]
  */
 @Service("WareHouseExport")
-public class WarehouseExport implements Export<Map<String, Object>> {
+public class WarehouseExport implements Export<WarehouseDTO2> {
     
     @Autowired
     private WarehouseService warehouseService;
     
     @SuppressWarnings("unchecked")
     @Override
-    public List<Map<String, Object>> getExportList(String json) throws Exception {
+    public List<WarehouseDTO2> getExportList(String json) throws Exception {
+
         ObjectMapper mapper = new ObjectMapper();
         mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        WarehouseQuery2 warehouseQuery = mapper.readValue(json, WarehouseQuery2.class);
-        List<WarehouseDTO2> list = new ArrayList<>();
-        int page = 1;
-        int pagecount = 10;
-        while (true) {
-            warehouseQuery.setPage(page);
-            warehouseQuery.setPagecount(pagecount);
-            List<WarehouseDTO2> list1 = warehouseService.qryWarehouseDetailList(warehouseQuery);
-            if (list1 == null || list1.isEmpty()) {
-                break;
-            }
-            list.addAll(list1);
-            if (list1.size() < pagecount) {
-                break;
-            }
-            page++;
-        }
-        List<Map<String, Object>> returnList = new ArrayList<>(8);
-        for (WarehouseDTO2 dto : list) {
-            Map<String, Object> map = mapper.readValue(mapper.writeValueAsString(dto), Map.class);
-            if (!StringUtils.isEmpty(dto.getWarehouseAttribution())) {
-                map.put("attributionName", dto.getWarehouseAttribution().equals("1") ? "CAMS仓库" : "安装服务商仓库");
-            }
-            returnList.add(map);
-        }
-        return returnList;
+        WarehouseQuery2 condition = mapper.readValue(json, WarehouseQuery2.class);
+        condition.setIsWarehousePage(2);
+        List<WarehouseDTO2> list = warehouseService.qryWarehouseDetailList(condition);
+        return list;
     }
     
 }