接口对接
This commit is contained in:
parent
456e88f4d4
commit
bd8bef233a
|
|
@ -174,11 +174,10 @@ public class PushProDataUseInfoController extends BaseController {
|
||||||
|
|
||||||
// 施工机具库存预警 (7大类)
|
// 施工机具库存预警 (7大类)
|
||||||
@GetMapping(value = "getInventoryAlert")
|
@GetMapping(value = "getInventoryAlert")
|
||||||
public TableDataInfo getInventoryAlert(ProIdsBean bean) {
|
public AjaxResult getInventoryAlert(ProIdsBean bean) {
|
||||||
try {
|
try {
|
||||||
startPage();
|
|
||||||
List<InventoryAlertBean> results = service.getInventoryAlert(bean);
|
List<InventoryAlertBean> results = service.getInventoryAlert(bean);
|
||||||
return getDataTable(results);
|
return AjaxResult.success(results);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error(e.toString(), e);
|
logger.error(e.toString(), e);
|
||||||
throw new ServiceException("数据查询异常,请联系运维人员查询日志处理");
|
throw new ServiceException("数据查询异常,请联系运维人员查询日志处理");
|
||||||
|
|
|
||||||
|
|
@ -378,8 +378,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
SELECT
|
SELECT
|
||||||
mt.type_name AS typeModelName,
|
mt.type_name AS typeModelName,
|
||||||
mt2.type_name AS typeName,
|
mt2.type_name AS typeName,
|
||||||
mt.unit_name AS unitName,
|
mt.unit_name AS unit,
|
||||||
mt.storage_num AS storageNum
|
mt.storage_num AS num
|
||||||
FROM
|
FROM
|
||||||
ma_type mt
|
ma_type mt
|
||||||
LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id
|
LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue