From ab2884ade73fed97d1e7d7daf4b9b5b6dee83fdd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 29 十月 2026 09:26:12 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicationItemController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicationItemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicationItemController.java
index 6d90b67..b46ea20 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicationItemController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicationItemController.java
@@ -6,9 +6,10 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.smartor.domain.MedicationItem;
-import com.smartor.service.IMedicationItemService;
+import com.ruoyi.common.core.domain.entity.MedicationItem;
+import com.ruoyi.common.core.service.IMedicationItemService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +17,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import java.util.Map;
/**
* 鑽搧淇℃伅Controller
@@ -37,10 +39,13 @@
//@PreAuthorize("@ss.hasPermi('smartor:item:list')")
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/list")
- public TableDataInfo list(@RequestBody MedicationItem medicationItem) {
- startPage();
+ public Map<String, Object> list(@RequestBody MedicationItem medicationItem) {
+ medicationItem.setPageNum(PageUtils.getOffset(medicationItem.getPageNum(), medicationItem.getPageSize()));
List<MedicationItem> list = medicationItemService.selectMedicationItemList(medicationItem);
- return getDataTable(list);
+ medicationItem.setPageNum(null);
+ medicationItem.setPageSize(null);
+ List<MedicationItem> total = medicationItemService.selectMedicationItemList(medicationItem);
+ return getDataTable3(total.size(), list);
}
/**
--
Gitblit v1.9.3