From 2136ebf3c9a32430a27b5c50d7a7452cc3b30fdd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 05 九月 2025 15:34:34 +0800
Subject: [PATCH] 审批日志

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java
index ff22b0f..b2e5e4a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java
@@ -31,7 +31,7 @@
 @Slf4j
 @Api("鎹愮尞鍣ㄥ畼鑾峰彇")
 @RestController
-@RequestMapping("/system/donationwitnessorgan")
+@RequestMapping("/project/donationwitnessorgan")
 public class ServiceDonationwitnessorganController extends BaseController {
     @Autowired
     private IServiceDonationwitnessorganService serviceDonationwitnessorganService;
@@ -40,7 +40,7 @@
      * 鏌ヨ鎹愮尞鍣ㄥ畼鑾峰彇鍒楄〃
      */
     @ApiOperation("鏌ヨ鎹愮尞鍣ㄥ畼鑾峰彇鍒楄〃")
-    @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:list')")
+//    // @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:list')")
     @GetMapping("/list")
     public TableDataInfo list(ServiceDonationwitnessorgan serviceDonationwitnessorgan) {
         startPage();
@@ -52,7 +52,7 @@
      * 瀵煎嚭鎹愮尞鍣ㄥ畼鑾峰彇鍒楄〃
      */
     @ApiOperation("瀵煎嚭鎹愮尞鍣ㄥ畼鑾峰彇鍒楄〃")
-    @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:export')")
+//    // @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:export')")
     @Log(title = "鎹愮尞鍣ㄥ畼鑾峰彇", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(ServiceDonationwitnessorgan serviceDonationwitnessorgan) {
@@ -65,8 +65,8 @@
      * 鑾峰彇鎹愮尞鍣ㄥ畼鑾峰彇璇︾粏淇℃伅
      */
     @ApiOperation("鑾峰彇鎹愮尞鍣ㄥ畼鑾峰彇璇︾粏淇℃伅")
-    @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:query')")
-    @GetMapping(value = "/{id}")
+//    // @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:query')")
+    @GetMapping(value = "/getInfo/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(serviceDonationwitnessorganService.getById(id));
     }
@@ -75,21 +75,22 @@
      * 鏂板鎹愮尞鍣ㄥ畼鑾峰彇
      */
     @ApiOperation("鏂板鎹愮尞鍣ㄥ畼鑾峰彇")
-    @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:add')")
+//    // @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:add')")
     @Log(title = "鎹愮尞鍣ㄥ畼鑾峰彇", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     @RepeatSubmit
     public AjaxResult add(@RequestBody ServiceDonationwitnessorgan serviceDonationwitnessorgan) {
-        return toAjax(serviceDonationwitnessorganService.save(serviceDonationwitnessorgan));
+        boolean save = serviceDonationwitnessorganService.save(serviceDonationwitnessorgan);
+        return AjaxResult.success(serviceDonationwitnessorgan);
     }
 
     /**
      * 淇敼鎹愮尞鍣ㄥ畼鑾峰彇
      */
     @ApiOperation("淇敼鎹愮尞鍣ㄥ畼鑾峰彇")
-    @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:edit')")
+//    // @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:edit')")
     @Log(title = "鎹愮尞鍣ㄥ畼鑾峰彇", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/edit")
     @RepeatSubmit
     public AjaxResult edit(@RequestBody ServiceDonationwitnessorgan serviceDonationwitnessorgan) {
         return toAjax(serviceDonationwitnessorganService.updateById(serviceDonationwitnessorgan));
@@ -99,15 +100,14 @@
      * 鍒犻櫎鎹愮尞鍣ㄥ畼鑾峰彇
      */
     @ApiOperation("鍒犻櫎鎹愮尞鍣ㄥ畼鑾峰彇")
-    @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:remove')")
+//    // @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:remove')")
     @Log(title = "鎹愮尞鍣ㄥ畼鑾峰彇", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
+    @GetMapping("/remove/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(serviceDonationwitnessorganService.removeByIds(Arrays.asList(ids)));
     }
 
 
-    @RepeatSubmit
     @ApiOperation("鏂板鎴栦慨鏀规崘鐚櫒瀹樿幏鍙�")
     @Log(title = "鎹愮尞鍣ㄥ畼鑾峰彇", businessType = BusinessType.UPDATE)
     @PostMapping("/saveOrUpdateDonationwitnessorgan")
@@ -118,6 +118,16 @@
         Boolean i = null;
         for (ServiceDonationwitnessorgan serviceDonationwitnessorgan : serviceDonationwitnessorganList) {
             log.info("鎹愮尞鍣ㄥ畼鑾峰彇id鏄惁涓虹┖ : {},鍩虹琛ㄧ殑id涓� : {}", serviceDonationwitnessorgan.getId(), serviceDonationwitnessorgan.getInfoid());
+            //鏍规嵁infoid鍜屽櫒瀹樼紪鍙凤紝鍒ゆ柇杩欎釜鍣ㄥ畼鏄惁宸茬粡瀛樿繘琛ㄤ腑
+            ServiceDonationwitnessorgan serviceDonationwitnessorgan2 = new ServiceDonationwitnessorgan();
+            serviceDonationwitnessorgan2.setInfoid(serviceDonationwitnessorgan.getInfoid());
+            serviceDonationwitnessorgan2.setOrganno(serviceDonationwitnessorgan.getOrganno());
+            serviceDonationwitnessorgan2.setDel_flag(0);
+            List<ServiceDonationwitnessorgan> serviceDonationwitnessorgans = serviceDonationwitnessorganService.queryList(serviceDonationwitnessorgan2);
+            log.info("serviceDonationwitnessorgans鐨勬暟閲忎负 : {},infoid涓猴細{}锛孫rganno涓猴細{}", serviceDonationwitnessorgans.size(), serviceDonationwitnessorgan.getInfoid(), serviceDonationwitnessorgan.getOrganno());
+            if (!CollectionUtils.isEmpty(serviceDonationwitnessorgans)) {
+                serviceDonationwitnessorgan.setId(serviceDonationwitnessorgans.get(0).getId());
+            }
             if (serviceDonationwitnessorgan.getId() == null) {
                 i = serviceDonationwitnessorganService.save(serviceDonationwitnessorgan);
             } else {

--
Gitblit v1.9.3