diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java index 2500f0ef..ea342df8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java @@ -2,6 +2,7 @@ package com.bonus.material.push.controller; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.material.push.domain.CostPushBean; import com.bonus.material.push.domain.MachineInfoBean; @@ -34,10 +35,10 @@ public class PushProDataUseInfoController extends BaseController { * @return */ @GetMapping(value = "getProDataUseInfo") - public TableDataInfo getProDataUseInfo(ProIdsBean bean) { + public AjaxResult getProDataUseInfo(ProIdsBean bean) { try { List results = service.getProDataUseInfo(bean); - return getDataTable(results); + return AjaxResult.success(results); } catch (Exception e) { logger.error(e.toString(), e); throw new ServiceException("数据查询异常,请联系运维人员查询日志处理"); @@ -61,10 +62,10 @@ public class PushProDataUseInfoController extends BaseController { } // 查询七大类设备保有量、在用量、再修量、库存量 @GetMapping(value = "getNumsByStatics") - public TableDataInfo getNumsByStatics(ProIdsBean bean) { + public AjaxResult getNumsByStatics(ProIdsBean bean) { try { List results = service.getNumsByStatics(bean); - return getDataTable(results); + return AjaxResult.success(results); } catch (Exception e) { logger.error(e.toString(), e); throw new ServiceException("数据查询异常,请联系运维人员查询日志处理"); @@ -72,10 +73,10 @@ public class PushProDataUseInfoController extends BaseController { } // 检验临期和检验超期数量 @GetMapping(value = "getApproachingAndTimeout") - public TableDataInfo getApproachingAndTimeout(ProIdsBean bean) { + public AjaxResult getApproachingAndTimeout(ProIdsBean bean) { try { List results = service.getApproachingAndTimeout(bean); - return getDataTable(results); + return AjaxResult.success(results); } catch (Exception e) { logger.error(e.toString(), e); throw new ServiceException("数据查询异常,请联系运维人员查询日志处理"); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/StaticsNumsBean.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/StaticsNumsBean.java index 19b7d5ee..1e2d4143 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/StaticsNumsBean.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/StaticsNumsBean.java @@ -2,18 +2,20 @@ package com.bonus.material.push.domain; import lombok.Data; +import java.math.BigDecimal; + /** * @Author:liang.chao * @Date:2025/8/23 - 16:29 */ @Data public class StaticsNumsBean { - private Integer inventoryNum; - private Integer useNum; - private Integer repairNum; - private Integer num; + private BigDecimal inventoryNum; + private BigDecimal useNum; + private BigDecimal repairNum; + private BigDecimal num; // 检验临期数量 - private Integer ApproachingNum; + private BigDecimal ApproachingNum; // 检验超期数量 - private Integer TimeoutNum; + private BigDecimal TimeoutNum; }