接口对接

bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java

@@ -174,11 +174,10 @@ public class PushProDataUseInfoController extends BaseController {
 
     // 施工机具库存预警 (7大类)
     @GetMapping(value = "getInventoryAlert")
-    public TableDataInfo getInventoryAlert(ProIdsBean bean) {
+    public AjaxResult getInventoryAlert(ProIdsBean bean) {
         try {
-            startPage();
             List<InventoryAlertBean> results = service.getInventoryAlert(bean);
-            return getDataTable(results);
+            return AjaxResult.success(results);
         } catch (Exception e) {
             logger.error(e.toString(), e);
             throw new ServiceException("数据查询异常，请联系运维人员查询日志处理");

bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml

@@ -378,8 +378,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         mt.type_name AS typeModelName,
         mt2.type_name AS typeName,
-        mt.unit_name AS unitName,
-        mt.storage_num AS storageNum
+        mt.unit_name AS unit,
+        mt.storage_num AS num
         FROM
         ma_type mt
         LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id