From 5fe107b01e611e03034efbb76b97c3faae539f6b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 25 四月 2025 11:03:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java |   42 +++++++++++++++++++++++++-----------------
 1 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java
index fa30e22..bea5353 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java
@@ -2,11 +2,10 @@
 
 import java.util.List;
 
+import com.ruoyi.common.utils.PageUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
 import javax.servlet.http.HttpServletResponse;
-
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -30,12 +29,13 @@
  * 鎮ｈ�呮墜鏈褰旵ontroller
  *
  * @author lihu
- * @date 2024-08-05
+ * @date 2025-02-25
  */
 @Api("鎮ｈ�呮墜鏈褰�")
 @RestController
 @RequestMapping("/smartor/operation")
-public class PatMedOperationController extends BaseController {
+public class PatMedOperationController extends BaseController
+{
     @Autowired
     private IPatMedOperationService patMedOperationService;
 
@@ -44,9 +44,11 @@
      */
     @ApiOperation("鏌ヨ鎮ｈ�呮墜鏈褰曞垪琛�")
     //@PreAuthorize("@ss.hasPermi('smartor:operation:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(PatMedOperation patMedOperation) {
-        startPage();
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody PatMedOperation patMedOperation)
+    {
+        //startPage();
+        PageUtils.startPageByPost(patMedOperation.getPageNum(), patMedOperation.getPageSize());
         List<PatMedOperation> list = patMedOperationService.selectPatMedOperationList(patMedOperation);
         return getDataTable(list);
     }
@@ -56,9 +58,10 @@
      */
     @ApiOperation("瀵煎嚭鎮ｈ�呮墜鏈褰曞垪琛�")
     //@PreAuthorize("@ss.hasPermi('smartor:operation:export')")
-    @Log(title = "鎮ｈ�呮墜鏈褰�" , businessType = BusinessType.EXPORT)
+    @Log(title = "鎮ｈ�呮墜鏈褰�", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, PatMedOperation patMedOperation) {
+    public void export(HttpServletResponse response, PatMedOperation patMedOperation)
+    {
         List<PatMedOperation> list = patMedOperationService.selectPatMedOperationList(patMedOperation);
         ExcelUtil<PatMedOperation> util = new ExcelUtil<PatMedOperation>(PatMedOperation.class);
         util.exportExcel(response, list, "鎮ｈ�呮墜鏈褰曟暟鎹�");
@@ -70,17 +73,20 @@
     @ApiOperation("鑾峰彇鎮ｈ�呮墜鏈褰曡缁嗕俊鎭�")
     //@PreAuthorize("@ss.hasPermi('smartor:operation:query')")
     @GetMapping(value = "/getInfo/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
         return success(patMedOperationService.selectPatMedOperationById(id));
     }
 
     /**
      * 鏂板鎮ｈ�呮墜鏈褰�
      */
+    @ApiOperation("鏂板鎮ｈ�呮墜鏈褰�")
     //@PreAuthorize("@ss.hasPermi('smartor:operation:add')")
-    @Log(title = "鎮ｈ�呮墜鏈褰�" , businessType = BusinessType.INSERT)
+    @Log(title = "鎮ｈ�呮墜鏈褰�", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody PatMedOperation patMedOperation) {
+    public AjaxResult add(@RequestBody PatMedOperation patMedOperation)
+    {
         return toAjax(patMedOperationService.insertPatMedOperation(patMedOperation));
     }
 
@@ -89,9 +95,10 @@
      */
     @ApiOperation("淇敼鎮ｈ�呮墜鏈褰�")
     //@PreAuthorize("@ss.hasPermi('smartor:operation:edit')")
-    @Log(title = "鎮ｈ�呮墜鏈褰�" , businessType = BusinessType.UPDATE)
+    @Log(title = "鎮ｈ�呮墜鏈褰�", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody PatMedOperation patMedOperation) {
+    public AjaxResult edit(@RequestBody PatMedOperation patMedOperation)
+    {
         return toAjax(patMedOperationService.updatePatMedOperation(patMedOperation));
     }
 
@@ -100,9 +107,10 @@
      */
     @ApiOperation("鍒犻櫎鎮ｈ�呮墜鏈褰�")
     //@PreAuthorize("@ss.hasPermi('smartor:operation:remove')")
-    @Log(title = "鎮ｈ�呮墜鏈褰�" , businessType = BusinessType.DELETE)
-    @GetMapping("/remove/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
+    @Log(title = "鎮ｈ�呮墜鏈褰�", businessType = BusinessType.DELETE)
+	@GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
         return toAjax(patMedOperationService.deletePatMedOperationByIds(ids));
     }
 }

--
Gitblit v1.9.3