新增资产信息全部导入功能

ruoyi-admin/src/main/java/com/ruoyi/asset/controller/TbAssetInformationController.java

@@ -78,6 +78,19 @@ public class TbAssetInformationController extends BaseController
     }
 
     /**
+     * 导出资产信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('asset:information:export')")
+    @Log(title = "资产信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/allExport")
+    public void allExport(HttpServletResponse response)
+    {
+        List<TbAssetInformation> list = tbAssetInformationService.selectTbAssetInformationList2(new TbAssetInformation());
+        ExcelUtil<TbAssetInformation> util = new ExcelUtil<TbAssetInformation>(TbAssetInformation.class);
+        util.exportExcel(response, list, "资产信息数据");
+    }
+
+    /**
      * 获取资产信息详细信息
      */
     @PreAuthorize("@ss.hasPermi('asset:information:query')")

ruoyi-admin/src/main/java/com/ruoyi/asset/domain/TbAssetInformation.java

@@ -57,6 +57,13 @@ public class TbAssetInformation extends BaseEntity
     @Excel(name = "资产分类编号")
     private String categoryNumber;
 
+    /** 分类ID */
+    private Long categoryId;
+
+    /** 分类名称 */
+    @Excel(name = "资产分类名称（导出）")
+    private String categoryName;
+
     /** 规格型号 */
     @Excel(name = "规格型号")
     private String specificationsModel;
@@ -73,10 +80,18 @@ public class TbAssetInformation extends BaseEntity
     @Excel(name = "使用部门")
     private String userDepartment;
 
+    /** 使用部门名称 */
+    @Excel(name = "使用部门名称（导出）")
+    private String userDepartmentName;
+
     /** 管理部门 */
     @Excel(name = "管理部门")
     private String department;
 
+    /** 管理部门名称 */
+    @Excel(name = "管理部门名称（导出）")
+    private String departmentName;
+
     /** 责任人 */
     @Excel(name = "责任人")
     private String responsiblePerson;
@@ -85,6 +100,15 @@ public class TbAssetInformation extends BaseEntity
     @Excel(name = "所在位置编号")
     private String locationNumber;
 
+    /** 位置ID */
+    private Long locationId;
+    /** 位置名称 */
+    @Excel(name = "所在位置名称（导出）")
+    private String locationName;
+    /** 位置标签 */
+    @Excel(name = "所在位置标签（导出）")
+    private String locationLabel;
+
     /** 资产性质 */
     @Excel(name = "资产性质")
     private String property;
@@ -165,6 +189,10 @@ public class TbAssetInformation extends BaseEntity
     @Excel(name = "所属公司")
     private String corporation;
 
+    /** 使用公司名称 */
+    @Excel(name = "所属公司名称（导出）")
+    private String corporationName;
+
     /** 记录状态，0：未提交，1：已提交 */
     @Excel(name = "记录状态，0：未提交，1：已提交", width = 30)
     private Long recordStatus;
@@ -196,28 +224,10 @@ public class TbAssetInformation extends BaseEntity
 
     /** 开始使用日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "开始使用日期")
+    @Excel(name = "开始使用日期", width = 40, dateFormat = "yyyy-MM-dd")
     private Date startDate;
 
     /** 预留字段j */
    // @Excel(name = "预留字段j")
     private String reservedColumnJ;
-
-    /** 位置ID */
-    private Long locationId;
-    /** 位置名称 */
-    private String locationName;
-    /** 位置标签 */
-    private String locationLabel;
-    /** 分类ID */
-    private Long categoryId;
-    /** 分类名称 */
-    private String categoryName;
-    /** 使用部门名称 */
-    private String userDepartmentName;
-    /** 管理部门名称 */
-    private String departmentName;
-    /** 使用公司名称 */
-    private String corporationName;
-
 }

ruoyi-ui/src/views/asset/information/index.vue

@@ -193,14 +193,28 @@
       <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['asset:information:remove']">删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['asset:information:export']">导出</el-button>
       </el-col>
       <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleAllExport" v-hasPermi="['asset:information:export']">全部导出</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
         <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['asset:information:import']">导入</el-button>
         <!-- v-hasPermi="['collegeManage:studentBase:import']" -->
       </el-col>
       <el-col :span="1.5">
+        <el-dropdown @command="handleCommand" split-button type="warning" trigger="click" placement="bottom-start" size="mini" v-hasPermi="['asset:information:export']">
+          <span class="el-dropdown-link" @click="handleExport">
+            <i class="el-icon-download"></i>&nbsp;导出
+          </span>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item command="batch"><span style="padding:8px;font-size: 13px;letter-spacing: 2px;">批量导出</span></el-dropdown-item>
+            <el-dropdown-item command="all" divided><span style="padding:8px;font-size: 13px;letter-spacing: 2px;">全部导出</span></el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </el-col>
+      <el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-printer" size="mini" :disabled="multiple" @click="handPrinter" v-hasPermi="['asset:information:query']">打印标签</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -1111,6 +1125,22 @@ export default {
         `information_${new Date().getTime()}.xlsx`
       )
     },
+    handleAllExport() {
+      this.download(
+        'asset/information/allExport',
+        {
+        },
+        `information_${new Date().getTime()}.xlsx`
+      )
+    },
+    handleCommand(command) {
+      if (command === 'batch') {
+        this.handleExport()
+      }
+      if (command === 'all') {
+        this.handleAllExport()
+      }
+    }
   },
 }
 </script>