From b6dd47b05107fc36d8ff4f7f29a4446521f95503 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 02 一月 2025 18:44:28 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java |   42 ++++++++++++++++++++++--------------------
 1 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
index 4b621a4..ef5f73b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
@@ -50,22 +50,23 @@
      * 鏌ヨ鎹愮尞鍣ㄥ畼绠＄悊鍒楄〃
      */
     @ApiOperation("鎹愮尞鍣ㄥ畼鍒楄〃")
-    //@PreAuthorize("@ss.hasPermi('project:donateorgan:list')")
+    //// @PreAuthorize("@ss.hasPermi('project:donateorgan:list')")
     @GetMapping("/list")
     public TableDataInfo list(ServiceDonateorgan serviceDonateorgan) {
         startPage();
         List<ServiceDonateorgan> list = serviceDonateorganService.queryList(serviceDonateorgan);
-        if (!CollectionUtils.isEmpty(list)) {
-            List<ServiceDonateorganVO> serviceDonateorganVOS = DtoConversionUtils.sourceToTarget(list, ServiceDonateorganVO.class);
-//            for (ServiceDonateorganVO serviceDonateorganVO : serviceDonateorganVOS) {
-//                ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
-//                serviceOrganallocation.setOrganid(serviceDonateorganVO.getId());
-//                List<ServiceOrganallocation> serviceOrganallocations = serviceOrganallocationService.selectServiceOrganallocationList(serviceOrganallocation);
-//                serviceDonateorganVO.setServiceOrganallocations(serviceOrganallocations);
-//            }
-            return getDataTable(serviceDonateorganVOS);
-        }
+        return getDataTable(list);
+    }
 
+
+    /**
+     * 鍣ㄥ畼鍒嗛厤绱
+     */
+    @ApiOperation("鍣ㄥ畼鍒嗛厤绱")
+    @GetMapping("/countList")
+    public TableDataInfo countList(ServiceDonateorgan serviceDonateorgan) {
+        startPage();
+        List<ServiceDonateorgan> list = serviceDonateorganService.countList(serviceDonateorgan);
         return getDataTable(list);
     }
 
@@ -81,7 +82,7 @@
      * 瀵煎嚭鎹愮尞鍣ㄥ畼绠＄悊鍒楄〃
      */
     @ApiOperation("瀵煎嚭鎹愮尞鍣ㄥ畼鍒楄〃")
-    //@PreAuthorize("@ss.hasPermi('project:donateorgan:export')")
+    //// @PreAuthorize("@ss.hasPermi('project:donateorgan:export')")
     @Log(title = "鎹愮尞鍣ㄥ畼绠＄悊", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(ServiceDonateorgan serviceDonateorgan) {
@@ -94,7 +95,7 @@
      * 鑾峰彇鎹愮尞鍣ㄥ畼绠＄悊璇︾粏淇℃伅
      */
     @ApiOperation("閫氳繃id鑾峰緱鎹愮尞鍣ㄥ畼淇℃伅")
-    //@PreAuthorize("@ss.hasPermi('project:donateorgan:query')")
+    //// @PreAuthorize("@ss.hasPermi('project:donateorgan:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(serviceDonateorganService.getById(id));
@@ -104,9 +105,9 @@
      * 鏂板鎹愮尞鍣ㄥ畼绠＄悊
      */
     @ApiOperation("鏂板鎹愮尞鍣ㄥ畼淇℃伅")
-    //@PreAuthorize("@ss.hasPermi('project:donateorgan:add')")
+    //// @PreAuthorize("@ss.hasPermi('project:donateorgan:add')")
     @Log(title = "鎹愮尞鍣ㄥ畼绠＄悊", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     @RepeatSubmit
     public AjaxResult add(@RequestBody ServiceDonateorgan serviceDonateorgan) {
         String organNumber = serviceDonateorgan.getDonorno() + "." + serviceDonateorgan.getOrganno();
@@ -121,7 +122,8 @@
             }
         }
         serviceDonateorgan.setOrgannumber(organNumber);
-        return toAjax(serviceDonateorganService.save(serviceDonateorgan));
+        boolean save = serviceDonateorganService.save(serviceDonateorgan);
+        return AjaxResult.success(serviceDonateorgan);
     }
 
 
@@ -129,7 +131,7 @@
      * 鏂板鎹愮尞鍣ㄥ畼绠＄悊
      */
     @ApiOperation("鏂板鎹愮尞鍣ㄥ畼淇℃伅")
-    //@PreAuthorize("@ss.hasPermi('project:donateorgan:add')")
+    //// @PreAuthorize("@ss.hasPermi('project:donateorgan:add')")
     @Log(title = "鎹愮尞鍣ㄥ畼绠＄悊", businessType = BusinessType.INSERT)
     @PostMapping("/addData")
     @RepeatSubmit
@@ -143,7 +145,7 @@
      * 淇敼鍣ㄥ畼鍒嗛厤
      */
     @ApiOperation("淇敼鍣ㄥ畼鍒嗛厤淇℃伅")
-    //@PreAuthorize("@ss.hasPermi('project:organallocation:edit')")
+    //// @PreAuthorize("@ss.hasPermi('project:organallocation:edit')")
     @Log(title = "鍣ㄥ畼鍒嗛厤", businessType = BusinessType.UPDATE)
     @PostMapping("/editarraydata")
     @RepeatSubmit
@@ -155,7 +157,7 @@
      * 淇敼鎹愮尞鍣ㄥ畼绠＄悊
      */
     @ApiOperation("淇敼鎹愮尞鍣ㄥ畼淇℃伅")
-    //@PreAuthorize("@ss.hasPermi('project:donateorgan:edit')")
+    //// @PreAuthorize("@ss.hasPermi('project:donateorgan:edit')")
     @Log(title = "鎹愮尞鍣ㄥ畼绠＄悊", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @RepeatSubmit
@@ -167,7 +169,7 @@
      * 鍒犻櫎鎹愮尞鍣ㄥ畼绠＄悊
      */
     @ApiOperation("鍒犻櫎鎹愮尞鍣ㄥ畼淇℃伅")
-    //@PreAuthorize("@ss.hasPermi('project:donateorgan:remove')")
+    //// @PreAuthorize("@ss.hasPermi('project:donateorgan:remove')")
     @Log(title = "鎹愮尞鍣ㄥ畼绠＄悊", businessType = BusinessType.DELETE)
     @GetMapping("/remove/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

--
Gitblit v1.9.3