代码提交

This commit is contained in:
liang.chao 2025-08-23 19:37:38 +08:00
parent 5cfcf6b3c3
commit ad5f3b5e94
2 changed files with 15 additions and 12 deletions

View File

@ -2,6 +2,7 @@ package com.bonus.material.push.controller;
import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.core.web.controller.BaseController; 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.common.core.web.page.TableDataInfo;
import com.bonus.material.push.domain.CostPushBean; import com.bonus.material.push.domain.CostPushBean;
import com.bonus.material.push.domain.MachineInfoBean; import com.bonus.material.push.domain.MachineInfoBean;
@ -34,10 +35,10 @@ public class PushProDataUseInfoController extends BaseController {
* @return * @return
*/ */
@GetMapping(value = "getProDataUseInfo") @GetMapping(value = "getProDataUseInfo")
public TableDataInfo getProDataUseInfo(ProIdsBean bean) { public AjaxResult getProDataUseInfo(ProIdsBean bean) {
try { try {
List<ProIdsBean> results = service.getProDataUseInfo(bean); List<ProIdsBean> results = service.getProDataUseInfo(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("数据查询异常,请联系运维人员查询日志处理");
@ -61,10 +62,10 @@ public class PushProDataUseInfoController extends BaseController {
} }
// 查询七大类设备保有量在用量再修量库存量 // 查询七大类设备保有量在用量再修量库存量
@GetMapping(value = "getNumsByStatics") @GetMapping(value = "getNumsByStatics")
public TableDataInfo getNumsByStatics(ProIdsBean bean) { public AjaxResult getNumsByStatics(ProIdsBean bean) {
try { try {
List<StaticsNumsBean> results = service.getNumsByStatics(bean); List<StaticsNumsBean> results = service.getNumsByStatics(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("数据查询异常,请联系运维人员查询日志处理");
@ -72,10 +73,10 @@ public class PushProDataUseInfoController extends BaseController {
} }
// 检验临期和检验超期数量 // 检验临期和检验超期数量
@GetMapping(value = "getApproachingAndTimeout") @GetMapping(value = "getApproachingAndTimeout")
public TableDataInfo getApproachingAndTimeout(ProIdsBean bean) { public AjaxResult getApproachingAndTimeout(ProIdsBean bean) {
try { try {
List<StaticsNumsBean> results = service.getApproachingAndTimeout(bean); List<StaticsNumsBean> results = service.getApproachingAndTimeout(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("数据查询异常,请联系运维人员查询日志处理");

View File

@ -2,18 +2,20 @@ package com.bonus.material.push.domain;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
/** /**
* @Authorliang.chao * @Authorliang.chao
* @Date2025/8/23 - 16:29 * @Date2025/8/23 - 16:29
*/ */
@Data @Data
public class StaticsNumsBean { public class StaticsNumsBean {
private Integer inventoryNum; private BigDecimal inventoryNum;
private Integer useNum; private BigDecimal useNum;
private Integer repairNum; private BigDecimal repairNum;
private Integer num; private BigDecimal num;
// 检验临期数量 // 检验临期数量
private Integer ApproachingNum; private BigDecimal ApproachingNum;
// 检验超期数量 // 检验超期数量
private Integer TimeoutNum; private BigDecimal TimeoutNum;
} }