Merge remote-tracking branch 'origin/main'

lab-admin/src/main/java/com/ruoyi/asset/controller/TbAssetController.java

@@ -2,6 +2,7 @@ package com.ruoyi.asset.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -62,14 +63,25 @@ public class TbAssetController extends BaseController
 
     /**
      * 导入
-     * @return
      */
     @Log(title = "资产信息", businessType = BusinessType.IMPORT)
     @PreAuthorize("@ss.hasPermi('asset:asset:add')")
     @PostMapping("/importData")
-    public void importData(HttpServletResponse response)
+    public AjaxResult importData(MultipartFile file) throws Exception {
+        // 获取模板工具
+        ExcelUtil<TbAsset> util = new ExcelUtil<>(TbAsset.class);
+        List<TbAsset> tbAssets = util.importExcel(file.getInputStream());
+        if (tbAssets.isEmpty()) {
+            return error("数据不得为空");
+        }
+        boolean result = tbAssetService.batchTbAsset(tbAssets);
+        return result ? success() : error();
+    }
+
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response)
     {
-        ExcelUtil<TbAsset> util = new ExcelUtil<TbAsset>(TbAsset.class);
+        ExcelUtil<TbAsset> util = new ExcelUtil<>(TbAsset.class);
         util.importTemplateExcel(response, "资产信息数据");
     }
 

lab-admin/src/main/java/com/ruoyi/asset/domain/TbAsset.java

@@ -63,6 +63,11 @@ public class TbAsset extends BaseEntity
     @TableField("quantity")
     private Long quantity;
 
+    /** 数量计量单位 */
+    @Excel(name = "数量计量单位")
+    @TableField("quantity_unit")
+    private String quantityUnit;
+
     /** 取得时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "取得时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -186,7 +191,14 @@ public class TbAsset extends BaseEntity
     {
         return quantity;
     }
-    public void setBuildDate(Date buildDate) 
+    public String getQuantityUnit() {
+        return quantityUnit;
+    }
+
+    public void setQuantityUnit(String quantityUnit) {
+        this.quantityUnit = quantityUnit;
+    }
+    public void setBuildDate(Date buildDate)
     {
         this.buildDate = buildDate;
     }

lab-admin/src/main/java/com/ruoyi/asset/mapper/TbAssetMapper.java

@@ -62,4 +62,12 @@ public interface TbAssetMapper extends BaseMapper<TbAsset>
      * @return 结果
      */
     public int deleteTbAssetByIds(Long[] ids);
+
+    /**
+     * 尝试插入资产信息
+     *
+     * @param tbAsset 资产信息
+     * @return 结果
+     */
+    public int replace(TbAsset tbAsset);
 }

lab-admin/src/main/java/com/ruoyi/asset/service/ITbAssetService.java

@@ -68,4 +68,12 @@ public interface ITbAssetService extends IService<TbAsset>
      * @return 资产信息
      */
     TbAsset selectTbAssetByBarCode(String barCode);
+
+    /**
+     * 批量新增
+     *
+     * @param tbAssetList 资产信息集合
+     * @return 结果
+     */
+    boolean batchTbAsset(List<TbAsset> tbAssetList);
 }

lab-admin/src/main/java/com/ruoyi/asset/service/impl/TbAssetServiceImpl.java

@@ -1,8 +1,13 @@
 package com.ruoyi.asset.service.impl;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -109,4 +114,14 @@ public class TbAssetServiceImpl extends ServiceImpl<TbAssetMapper, TbAsset> impl
         // 查询资产信息
         return query().eq("bar_code", barCode).one();
     }
+
+    @Override
+    public boolean batchTbAsset(List<TbAsset> tbAssetList) {
+        for (TbAsset tbAsset : tbAssetList) {
+            if (StrUtil.isNotBlank(tbAsset.getBarCode())) {
+                tbAssetMapper.replace(tbAsset);
+            }
+        }
+        return true;
+    }
 }

lab-admin/src/main/resources/mapper/asset/TbAssetMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="categoryNumber"    column="category_number"    />
         <result property="amount"    column="amount"    />
         <result property="quantity"    column="quantity"    />
+        <result property="quantityUnit"    column="quantity_unit"    />
         <result property="buildDate"    column="build_date"    />
         <result property="placeName"    column="place_name"    />
         <result property="purpose"    column="purpose"    />
@@ -66,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="categoryNumber != null and categoryNumber != ''">category_number,</if>
             <if test="amount != null">amount,</if>
             <if test="quantity != null">quantity,</if>
+            <if test="quantityUnit != null">quantity_unit,</if>
             <if test="buildDate != null">build_date,</if>
             <if test="placeName != null">place_name,</if>
             <if test="purpose != null">purpose,</if>
@@ -86,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="categoryNumber != null and categoryNumber != ''">#{categoryNumber},</if>
             <if test="amount != null">#{amount},</if>
             <if test="quantity != null">#{quantity},</if>
+            <if test="quantityUnit != null">#{quantityUnit},</if>
             <if test="buildDate != null">#{buildDate},</if>
             <if test="placeName != null">#{placeName},</if>
             <if test="purpose != null">#{purpose},</if>
@@ -110,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="categoryNumber != null and categoryNumber != ''">category_number = #{categoryNumber},</if>
             <if test="amount != null">amount = #{amount},</if>
             <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="quantityUnit != null">quantity_unit = #{quantityUnit},</if>
             <if test="buildDate != null">build_date = #{buildDate},</if>
             <if test="placeName != null">place_name = #{placeName},</if>
             <if test="purpose != null">purpose = #{purpose},</if>
@@ -135,4 +139,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <insert id="replace" parameterType="TbAsset">
+        replace into tb_asset
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="barCode != null and barCode != ''">bar_code,</if>
+            <if test="number != null and number != ''">number,</if>
+            <if test="name != null and name != ''">name,</if>
+            <if test="kind != null and kind != ''">kind,</if>
+            <if test="categoryNumber != null and categoryNumber != ''">category_number,</if>
+            <if test="amount != null">amount,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="quantityUnit != null">quantity_unit,</if>
+            <if test="buildDate != null">build_date,</if>
+            <if test="placeName != null">place_name,</if>
+            <if test="purpose != null">purpose,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="registrant != null and registrant != ''">registrant,</if>
+            <if test="specificationsModel != null and specificationsModel != ''">specifications_model,</if>
+            <if test="remark != null">remark,</if>
+            <if test="manufacturer != null">manufacturer,</if>
+            <if test="brand != null">brand,</if>
+            <if test="supplier != null">supplier,</if>
+            <if test="status != null">status,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="barCode != null and barCode != ''">#{barCode},</if>
+            <if test="number != null and number != ''">#{number},</if>
+            <if test="name != null and name != ''">#{name},</if>
+            <if test="kind != null and kind != ''">#{kind},</if>
+            <if test="categoryNumber != null and categoryNumber != ''">#{categoryNumber},</if>
+            <if test="amount != null">#{amount},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="quantityUnit != null">#{quantityUnit},</if>
+            <if test="buildDate != null">#{buildDate},</if>
+            <if test="placeName != null">#{placeName},</if>
+            <if test="purpose != null">#{purpose},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="registrant != null and registrant != ''">#{registrant},</if>
+            <if test="specificationsModel != null and specificationsModel != ''">#{specificationsModel},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="manufacturer != null">#{manufacturer},</if>
+            <if test="brand != null">#{brand},</if>
+            <if test="supplier != null">#{supplier},</if>
+            <if test="status != null">#{status},</if>
+        </trim>
+    </insert>
 </mapper>

lab-ui/src/views/asset/asset/index.vue

@@ -78,6 +78,7 @@
           v-model="queryParams.deptId"
           :options="deptList"
           :show-all-levels="false"
+          filterable
           clearable :props="{value: 'id'}"
           placeholder="请选择使用部门"
         ></el-cascader>
@@ -212,6 +213,7 @@
       </el-table-column>
       <el-table-column label="资产原值" align="center" prop="amount" />
       <el-table-column label="数量" align="center" prop="quantity" />
+      <el-table-column label="数量计量单位" align="center" prop="quantityUnit" />
       <el-table-column label="取得时间" align="center" prop="buildDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.buildDate, '{y}-{m}-{d}') }}</span>
@@ -254,7 +256,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -281,12 +283,19 @@
               v-for="dict in dict.type.asset_kind"
               :key="dict.value"
               :label="dict.label"
-:value="dict.value"
+              :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="资产分类编号" prop="categoryNumber">
-          <el-input v-model="form.categoryNumber" placeholder="请输入资产分类编号" />
+        <el-form-item label="资产分类" prop="categoryNumber">
+          <el-select v-model="form.categoryNumber" filterable placeholder="请输入资产分类">
+            <el-option
+              v-for="item in assetCategoryList"
+              :key="item.number"
+              :label="item.name"
+              :value="item.number">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="资产原值" prop="amount">
           <el-input v-model="form.amount" placeholder="请输入资产原值" />
@@ -294,6 +303,9 @@
         <el-form-item label="数量" prop="quantity">
           <el-input v-model="form.quantity" placeholder="请输入数量" />
         </el-form-item>
+        <el-form-item label="数量计量单位" prop="quantity">
+          <el-input v-model="form.quantityUnit" placeholder="请输入数量计量单位" />
+        </el-form-item>
         <el-form-item label="取得时间" prop="buildDate">
           <el-date-picker clearable
             v-model="form.buildDate"
@@ -303,7 +315,14 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="存放地点" prop="placeName">
-          <el-input v-model="form.placeName" placeholder="请输入存放地点" />
+          <el-select v-model="form.placeName" filterable placeholder="请输入存放地点">
+            <el-option
+              v-for="item in placeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.name">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="资产用途" prop="purpose">
           <el-select v-model="form.purpose" placeholder="请选择资产用途">
@@ -315,8 +334,15 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="使用部门ID" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入使用部门ID" />
+        <el-form-item label="使用部门" prop="deptId">
+          <el-cascader
+            v-model="form.deptId"
+            :options="deptList"
+            :show-all-levels="false"
+            filterable
+            clearable :props="{value: 'id'}"
+            placeholder="请选择使用部门"
+          ></el-cascader>
         </el-form-item>
         <el-form-item label="登记人" prop="registrant">
           <el-input v-model="form.registrant" placeholder="请输入登记人" />
@@ -367,6 +393,13 @@
       >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+          </div>
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+        </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitFileForm">确 定</el-button>
@@ -538,6 +571,7 @@ export default {
         categoryNumber: null,
         amount: null,
         quantity: null,
+        quantityUnit: null,
         buildDate: null,
         placeName: null,
         purpose: null,
@@ -621,9 +655,14 @@ export default {
       }, `asset_${new Date().getTime()}.xlsx`)
     },
     handleImport() {
-      this.upload.title = "资产信息导入"; // todo
+      this.upload.title = "资产信息导入";
       this.upload.open = true;
     },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download('asset/asset/importTemplate', {
+      }, `asset_template_${new Date().getTime()}.xlsx`)
+    },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
       this.upload.isUploading = true;

lab-ui/src/views/asset/place/index.vue

@@ -120,8 +120,8 @@
       </div>
     </el-dialog>
 
-        <!-- 导入对话框 -->
-        <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <!-- 导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
       <el-upload
         ref="upload"
         :limit="1"
@@ -264,13 +264,13 @@ export default {
       this.upload.title = "地点导入";
       this.upload.open = true;
     },
-        /** 下载模板操作 */
-        importTemplate() {
+    /** 下载模板操作 */
+    importTemplate() {
       this.download('asset/place/importTemplate', {
       }, `place_template_${new Date().getTime()}.xlsx`)
     },
-        // 文件上传中处理
-        handleFileUploadProgress(event, file, fileList) {
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
       this.upload.isUploading = true;
     },
     // 文件上传成功处理