林武泰/优化资产信息导入导出功能

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

@@ -56,7 +56,7 @@ public class TbAssetController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, TbAsset tbAsset)
     {
-        List<TbAsset> list = tbAssetService.selectTbAssetList(tbAsset);
+        List<TbAsset> list = tbAssetService.exportData(tbAsset);
         ExcelUtil<TbAsset> util = new ExcelUtil<TbAsset>(TbAsset.class);
         util.exportExcel(response, list, "资产信息数据");
     }

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

@@ -85,10 +85,14 @@ public class TbAsset extends BaseEntity
     private String purpose;
 
     /** 使用部门ID */
-    @Excel(name = "使用部门ID")
     @TableField("dept_id")
     private Long deptId;
 
+    /** 使用部门名称 */
+    @Excel(name = "使用部门")
+    @TableField(exist = false)
+    private String deptName;
+
     /** 登记人 */
     @Excel(name = "登记人")
     @TableField("registrant")
@@ -115,7 +119,7 @@ public class TbAsset extends BaseEntity
     private String supplier;
 
     /** 状态 */
-    @Excel(name = "状态")
+    @Excel(name = "状态", readConverterExp = "0=故障,1=正常,2=报废", combo = {"正常", "故障", "报废"})
     @TableField("status")
     private Long status;
 
@@ -234,7 +238,16 @@ public class TbAsset extends BaseEntity
     {
         return deptId;
     }
-    public void setRegistrant(String registrant) 
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public void setRegistrant(String registrant)
     {
         this.registrant = registrant;
     }

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

@@ -76,4 +76,11 @@ public interface ITbAssetService extends IService<TbAsset>
      * @return 结果
      */
     boolean batchTbAsset(List<TbAsset> tbAssetList);
+
+    /**
+     * 导出数据
+     *
+     * @return 资产信息集合
+     */
+    List<TbAsset> exportData(TbAsset tbAsset);
 }

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

@@ -3,18 +3,25 @@ package com.ruoyi.asset.service.impl;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 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 com.ruoyi.asset.domain.TbAssetCategory;
+import com.ruoyi.asset.mapper.TbAssetCategoryMapper;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.system.mapper.SysDeptMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.asset.mapper.TbAssetMapper;
 import com.ruoyi.asset.domain.TbAsset;
 import com.ruoyi.asset.service.ITbAssetService;
 
+import javax.annotation.Resource;
+
 /**
  * 资产信息Service业务层处理
  * 
@@ -27,6 +34,12 @@ public class TbAssetServiceImpl extends ServiceImpl<TbAssetMapper, TbAsset> impl
     @Autowired
     private TbAssetMapper tbAssetMapper;
 
+    @Resource
+    private SysDeptMapper sysDeptMapper;
+
+    @Resource
+    private TbAssetCategoryMapper tbAssetCategoryMapper;
+
     /**
      * 查询资产信息
      * 
@@ -117,11 +130,42 @@ public class TbAssetServiceImpl extends ServiceImpl<TbAssetMapper, TbAsset> impl
 
     @Override
     public boolean batchTbAsset(List<TbAsset> tbAssetList) {
+        int success = 0;
+        List<SysDept> deptList = sysDeptMapper.allDept();
+        List<TbAssetCategory> assetCategoryList = tbAssetCategoryMapper.selectList(null);
         for (TbAsset tbAsset : tbAssetList) {
             if (StrUtil.isNotBlank(tbAsset.getBarCode())) {
-                tbAssetMapper.replace(tbAsset);
+                long count = deptList.stream().filter(sysDept -> sysDept.getDeptId().equals(tbAsset.getDeptId())).count();
+                List<SysDept> collect = deptList.stream().filter(sysDept -> sysDept.getDeptName().equals(tbAsset.getDeptName())).collect(Collectors.toList());
+                SysDept dept = null;
+                if (!collect.isEmpty()) {
+                    dept = collect.get(0);
+                }
+
+                long count1 = assetCategoryList.stream().filter(tbAssetCategory -> tbAssetCategory.getNumber().equals(tbAsset.getCategoryNumber())).count();
+                if ((count > 0 || dept != null) && count1 > 0) {
+                    if (dept != null) {
+                        tbAsset.setDeptId(dept.getDeptId());
+                    }
+                    int replace = tbAssetMapper.replace(tbAsset);
+                    if (replace > 0) {
+                        success++;
+                    }
+                }
             }
         }
-        return true;
+        return success != 0;
+    }
+
+    @Override
+    public List<TbAsset> exportData(TbAsset asset) {
+        List<SysDept> deptList = sysDeptMapper.allDept();
+        List<TbAsset> assetList = selectTbAssetList(asset);
+        for (TbAsset tbAsset : assetList) {
+            List<SysDept> collect = deptList.stream().filter(sysDept -> sysDept.getDeptId().equals(tbAsset.getDeptId())).collect(Collectors.toList());
+            SysDept sysDept = collect.get(0);
+            tbAsset.setDeptName(sysDept.getDeptName());
+        }
+        return assetList;
     }
 }

lab-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java

@@ -3,6 +3,7 @@ package com.ruoyi.system.mapper;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * 部门管理 数据层
@@ -115,4 +116,12 @@ public interface SysDeptMapper
      * @return 结果
      */
     public int deleteDeptById(Long deptId);
+
+    /**
+     * 获取全部部门信息
+     *
+     * @return 部门信息集合
+     */
+    @Select("select dept_id, parent_id, ancestors, dept_name, order_num, leader, phone, email, status, del_flag, create_by, create_time from sys_dept")
+    List<SysDept> allDept();
 }