diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchMissStatisticsController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchMissStatisticsController.java index 10fb72c37..22958554f 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchMissStatisticsController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchMissStatisticsController.java @@ -1,9 +1,9 @@ package com.xdadan.erp.web.emis; import com.xdadan.erp.common.annotation.Log; -import com.xdadan.erp.common.core.domain.AjaxResult; +import com.xdadan.erp.common.core.controller.BaseController; +import com.xdadan.erp.common.core.page.TableDataInfo; import com.xdadan.erp.common.enums.BusinessType; -import com.xdadan.erp.emis.domain.EmisTmsSiteBatchMiss; import com.xdadan.erp.emis.domain.EmisTmsSiteBatchMissStatistics; import com.xdadan.erp.emis.service.IEmisTmsSiteBatchMissStatisticsService; import lombok.extern.slf4j.Slf4j; @@ -12,6 +12,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; import static com.xdadan.erp.common.utils.PageUtils.startPage; @@ -25,7 +26,7 @@ import static com.xdadan.erp.common.utils.PageUtils.startPage; @RestController @RequestMapping("/emis/emisTmsSiteBatchMissStatistics") @Slf4j -public class EmisTmsSiteBatchMissStatisticsController { +public class EmisTmsSiteBatchMissStatisticsController extends BaseController { @Autowired private IEmisTmsSiteBatchMissStatisticsService statisticsService; @@ -35,15 +36,18 @@ public class EmisTmsSiteBatchMissStatisticsController { */ @PreAuthorize("@ss.hasPermi('emis:emisTmsSiteBatchMissStatistics:list')") @GetMapping("/list") - public AjaxResult list(EmisTmsSiteBatchMissStatistics emisTmsSiteBatchMissStatistics) { + public TableDataInfo list(EmisTmsSiteBatchMissStatistics emisTmsSiteBatchMissStatistics) { try { startPage(); List list = statisticsService .selectStatisticsList(emisTmsSiteBatchMissStatistics); - return AjaxResult.success(list); + return getDataTable(list); } catch (Exception e) { log.error("查询漏组批次统计列表失败", e); - return AjaxResult.error("查询失败:" + e.getMessage()); + TableDataInfo tableDataInfo = getDataTable(new ArrayList<>()); + tableDataInfo.setCode(500); + tableDataInfo.setMsg("查询失败:" + e.getMessage()); + return tableDataInfo; } }