通过新增方法修改手持机调用接口返回的部门和公司为名称

ruoyi-admin/src/main/java/com/ruoyi/asset/mapper/TbAssetInformationMapper.java

@@ -38,6 +38,13 @@ public interface TbAssetInformationMapper
     public List<TbAssetInformation> selectTbAssetInformationList( TbAssetInformation tbAssetInformation);
 
     /**
+     * 查询把部门ID替换为名称的资产列表
+     * @param tbAssetInformation
+     * @return
+     */
+    public List<TbAssetInformation> selectInfoList(TbAssetInformation tbAssetInformation);
+
+    /**
      * 新增资产信息
      * 
      * @param tbAssetInformation 资产信息

ruoyi-admin/src/main/java/com/ruoyi/asset/service/ITbAssetInformationService.java

@@ -35,6 +35,8 @@ public interface ITbAssetInformationService
      */
     public List<TbAssetInformation> selectTbAssetInformationList(TbAssetInformation tbAssetInformation);
 
+    List<TbAssetInformation> selectInfoList(TbAssetInformation tbAssetInformation);
+
     /**
      * 新增资产信息
      * 

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

@@ -77,6 +77,14 @@ public class TbAssetInformationServiceImpl implements ITbAssetInformationService
         return tbAssetInformationMapper.selectTbAssetInformationList(tbAssetInformation);
     }
 
+    @Override
+    public List<TbAssetInformation> selectInfoList(TbAssetInformation tbAssetInformation){
+        String locationNumber = tbAssetInformation.getLocationNumber();
+        List<String> childrens = new RecursionUtil().getNumberWithChildren(locationMapper, locationNumber);
+        tbAssetInformation.setNlist(childrens);
+        return tbAssetInformationMapper.selectInfoList(tbAssetInformation);
+    }
+
 
     /**
      * 新增资产信息

ruoyi-admin/src/main/java/com/ruoyi/visitor/controller/VController.java

@@ -23,7 +23,7 @@ public class VController extends BaseController {
     {
         TbAssetInformation tbAssetInformation = new TbAssetInformation();
         tbAssetInformation.setLocationNumber(number);
-        List<TbAssetInformation> list = tbAssetInformationService.selectTbAssetInformationList(tbAssetInformation);
+        List<TbAssetInformation> list = tbAssetInformationService.selectInfoList(tbAssetInformation);
         return getDataTable(list);
     }
 }

ruoyi-admin/src/main/resources/mapper/asset/TbAssetInformationMapper.xml

@@ -59,11 +59,57 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, code, name, number, image_url, category_number, specifications_model, abc_category, manage_status, user_department, department, responsible_person, location_number, property, purchase_date, commissioning_date, original_value, durable_years, net_value, residual_value, accumulated_depreciation, last_depreciation_date, depreciation_method, contract_number, factory_number, manufacturer, supplier, purpose, maintenance_date, maintenance_tel, maintenance_user, corporation, record_status, remark, create_by, create_time, update_by, update_time, is_whitelist, reserved_column_b, reserved_column_c, reserved_column_d, reserved_column_e, reserved_column_f, reserved_column_g, reserved_column_h, reserved_column_i, reserved_column_j from tb_asset_information
     </sql>
 
-<!--
-    0
-
-     number in （0， 1, 2, 3）
--->
+    <select id="selectInfoList" parameterType="TbAssetInformation" resultType="TbAssetInformation">
+        SELECT a.id,
+               a.code,
+               a.name,
+               a.number,
+               a.image_url imageUrl,
+               a.category_number categoryNumber,
+               a.specifications_model specificationsModel,
+               a.abc_category abcCategory,
+               a.manage_status manageStatus,
+               b.dept_name userDepartment,
+               a.department,
+               a.responsible_person responsiblePerson,
+               a.location_number locationNumber,
+               a.property,
+               a.purchase_date purchaseDate,
+               a.commissioning_date commissioningDate,
+               a.original_value originalValue,
+               a.durable_years durableYears,
+               a.net_value netValue,
+               a.residual_value residualValue,
+               a.accumulated_depreciation accumulatedDepreciation,
+               a.last_depreciation_date lastDepreciationDate,
+               a.depreciation_method depreciationMethod,
+               a.contract_number contractNumber,
+               a.factory_number factoryNumber,
+               a.manufacturer,
+               a.supplier,
+               a.purpose,
+               a.maintenance_date maintenanceDate,
+               a.maintenance_tel maintenanceTel,
+               a.maintenance_user maintenanceUser,
+               d.dept_name Corporation,
+               a.record_status recordStatus,
+               a.remark,
+               a.create_by createBy,
+               a.create_time createTime,
+               a.update_by updateBy,
+               a.update_time updateTime,
+               a.is_whitelist isWhitelist
+        from tb_asset_information a
+        left join sys_dept b on a.user_department = b.dept_id
+        left join sys_dept d on a.corporation = d.dept_id
+        <where>
+            <if test="locationNumber != null  and locationNumber != ''"> and location_number in
+                <foreach collection="nlist" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
 
     <select id="selectTbAssetInformationList" parameterType="TbAssetInformation" resultMap="TbAssetInformationResult">
         <include refid="selectTbAssetInformationVo"/>