Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/vo/EquCategoryVo.java

@@ -11,11 +11,13 @@ import java.util.List;
 public class EquCategoryVo {
     public String value;
     public String label;
+    public String title;
     public List<EquCategoryVo> children;
 
-    public EquCategoryVo(String label, String value) {
+    public EquCategoryVo(String label, String value, List<EquCategoryVo> children) {
         this.label = label;
         this.value = value;
+        this.title = label;
+        this.children = children;
     }
-
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/StCommonServiceImpl.java

@@ -331,8 +331,8 @@ public class StCommonServiceImpl {
      */
     private EquCategoryVo createEquCategoryVo(List<EquipmentCategoryDto> equipmentCategoryList) {
         List<EquCategoryVo> children = equipmentCategoryList.stream()
-                .map(dto -> new EquCategoryVo(dto.getName(), dto.getCode()))
+                .map(dto -> new EquCategoryVo(dto.getName(), dto.getCode(), null))
                 .collect(Collectors.toList());
-        return new EquCategoryVo(null, "全部设备", children);
+        return new EquCategoryVo("全部设备",null, children);
     }
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java

@@ -1013,7 +1013,7 @@ public class ZLDPStatisticsServiceImpl {
             return Lists.newArrayList();
         }
         return equipmentCategoryList.stream()
-                .map(dto -> new EquCategoryVo(dto.getName(), dto.getCode()))
+                .map(dto -> new EquCategoryVo(dto.getName(), dto.getCode(), null))
                 .collect(Collectors.toList());
     }
 }