维修

platform-dao/src/main/java/com/platform/dao/dto/project/ProjectDTO.java

@@ -23,6 +23,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class ProjectDTO extends BaseDTO implements Serializable {
+    private String remark;
     private List<String> parentList;
 
     private List<String> nameList;

platform-dao/src/main/java/com/platform/dao/entity/project/Project.java

@@ -20,6 +20,7 @@ import java.util.List;
 @Table(name = "t_project")
 @Data
 public class Project implements Serializable {
+    private String remark;
     private Integer sort;
 
     private Integer type;

platform-dao/src/main/java/com/platform/dao/vo/export/project/ExportProjectVO.java

@@ -0,0 +1,67 @@
+package com.platform.dao.vo.export.project;
+
+import com.platform.office.annotation.Excel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @Description 设备类别导出VO
+ * @Author liuyu
+ * @Date 2020-04-21 16:53:51
+ * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+public class ExportProjectVO implements Serializable {
+
+    /**
+     * 类型id
+     */
+    @Excel(name = "类型id", orderNum = "1")
+    private String id;
+
+    /**
+     * 类型编码
+     */
+    @Excel(name = "类型编码", orderNum = "2")
+    private String no;
+
+    /**
+     * 类型名称
+     */
+    @Excel(name = "类型名称", orderNum = "3")
+    private String name;
+
+    /**
+     * 类型类型 1：大类2：子类
+     */
+    @Excel(name = "类型类型 1：大类2：子类", orderNum = "4", dicCode="SBTYPE_TYPE")
+    private Integer type;
+
+    /**
+     * 排序
+     */
+    @Excel(name = "排序", orderNum = "5")
+    private Integer sort;
+
+    /**
+     * 上层类型id
+     */
+    @Excel(name = "上层类型id", orderNum = "6")
+    private String parentId;
+
+    /**
+     * 上层类型id
+     */
+    @Excel(name = "上层类型名称（导入时，可不填）", orderNum = "7")
+    private String parentName;
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", orderNum = "8")
+    private String remark;
+
+}

platform-dao/src/main/java/com/platform/dao/vo/query/project/ProjectVO.java

@@ -23,6 +23,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class ProjectVO extends BaseVO implements Serializable {
+    private String remark;
     private String parentName;
     private Integer sort;
     private List<ProjectVO> children;

platform-dao/src/main/resources/mapper/project/ProjectMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.platform.dao.mapper.project.ProjectMapper">
     <sql id="Base_Column_List">
         t1.id,  t1.no, t1.name,  t1.parent_id,
-        pt.name as parentName,t1.type
+        pt.name as parentName,t1.type,t1.remark
     </sql>
 
     <select id="selectVOList" parameterType="com.platform.dao.dto.project.ProjectDTO"

platform-rest/src/main/java/com/platform/rest/controller/project/ProjectController.java

@@ -11,6 +11,7 @@ import com.platform.dao.entity.project.Project;
 import com.platform.dao.entity.sb.SbType;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.util.TreeUtil;
+import com.platform.dao.vo.export.project.ExportProjectVO;
 import com.platform.dao.vo.export.sb.ExportSbTypeVO;
 import com.platform.dao.vo.query.project.ProjectVO;
 import com.platform.dao.vo.sb.SbTypeVO;
@@ -138,11 +139,11 @@ public class ProjectController {
      * @return R
      */
     @GetMapping("/export")
-    @SysLog("设备类别导出")
+    @SysLog("项目类别导出")
     @PreAuthorize("@pms.hasPermission('sb-types-export')")
     public void export(HttpServletResponse response, ProjectDTO sbTypeDTO) {
         List<ProjectVO> list = projectService.selectVOList(sbTypeDTO);
-        ExcelUtil.exportResponseDict(response, ExportSbTypeVO.class, BeanConverterUtil.copyListProperties(list, ExportSbTypeVO.class), "设备类别");
+        ExcelUtil.exportResponseDict(response, ExportProjectVO.class, BeanConverterUtil.copyListProperties(list, ExportProjectVO.class), "项目类别");
     }
 
     /**