合并代码

bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeSelect.java

@@ -0,0 +1,56 @@
+package com.bonus.common.biz.domain;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * TreeSelect树结构实体类
+ * @author syruan
+ */
+@Data
+public class TreeSelect implements Serializable {
+
+    private static final long serialVersionUID = 469203039368157600L;
+
+    /** 节点ID */
+    private Long id;
+
+    /** 节点名称 */
+    private String label;
+
+    /** 节点级别 */
+    private Integer level;
+
+    /** 父节点id */
+    private Long parentId;
+
+    /** 公司id */
+    private String companyId;
+
+    /** 子节点集合 */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<TreeSelect> children;
+
+    public TreeSelect() {
+
+    }
+
+    public TreeSelect(Long id, String label, Integer level, Long parentId, List<TreeSelect> children) {
+        this.id = id;
+        this.label = label;
+        this.level = level;
+        this.parentId = parentId;
+        this.children = children;
+    }
+
+    public TreeSelect(Long id, String label, Integer level, Long parentId) {
+        this.id = id;
+        this.label = label;
+        this.level = level;
+        this.parentId = parentId;
+    }
+
+}

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmAssetAttributesController.java

@@ -8,13 +8,9 @@ import com.bonus.common.log.annotation.SysLog;
 import com.bonus.common.log.enums.OperaType;
 import com.bonus.common.security.annotation.RequiresPermissions;
 import com.bonus.material.basic.domain.BmAssetAttributes;
-import com.bonus.material.basic.domain.BmUnitType;
 import com.bonus.material.basic.service.BmAssetAttributesService;
 import com.bonus.material.common.annotation.PreventRepeatSubmit;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java

@@ -6,6 +6,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotNull;
 
+import com.bonus.common.biz.domain.TreeSelect;
 import com.bonus.common.log.enums.OperaType;
 import com.bonus.material.common.annotation.PreventRepeatSubmit;
 import com.bonus.material.ma.vo.MaTypeListVo;

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ITypeService.java

@@ -2,6 +2,7 @@ package com.bonus.material.ma.service;
 
 import java.util.List;
 
+import com.bonus.common.biz.domain.TreeSelect;
 import com.bonus.material.ma.domain.Type;
 import com.bonus.material.ma.vo.MaTypeListVo;
 import com.bonus.material.ma.vo.MaTypeSelectVo;

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import com.bonus.common.biz.domain.TreeSelect;
 import com.bonus.common.biz.enums.DataCodeEnum;
 import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.core.utils.StringUtils;

bonus-modules/bonus-material/src/main/java/com/bonus/material/warehouse/domain/WhHouseSet.java

@@ -1,5 +1,6 @@
 package com.bonus.material.warehouse.domain;
 
+import com.bonus.common.biz.domain.TreeSelect;
 import com.bonus.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

bonus-modules/bonus-material/src/main/resources/bootstrap.yml

@@ -1,5 +1,5 @@
 # Spring
-spring: 
+spring:
   application:
     # 应用名称
     name: bonus-material