From 8b8ca4fb9791a5b79107e354cde500ed6f278219 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期日, 08 十月 2023 18:27:53 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
index 3f90a36..a0d8937 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
@@ -3,6 +3,7 @@
 import java.io.*;
 import java.util.*;
 
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.project.domain.FunddetailReqVo;
 import com.ruoyi.project.domain.vo.TaxMoneyVO;
 import io.swagger.annotations.Api;
@@ -95,7 +96,7 @@
     @ApiOperation("淇敼璐圭敤鐢宠鏄庣粏")
     //@PreAuthorize("@ss.hasPermi('project:funddetail:edit')")
     @Log(title = "璐圭敤鐢宠鏄庣粏", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/edit")
     @RepeatSubmit
     public AjaxResult edit(@RequestBody ServiceFunddetail serviceFunddetail) {
         return toAjax(serviceFunddetailService.updateById(serviceFunddetail));
@@ -107,7 +108,7 @@
     @ApiOperation("鍒犻櫎璐圭敤鐢宠鏄庣粏")
     //@PreAuthorize("@ss.hasPermi('project:funddetail:remove')")
     @Log(title = "璐圭敤鐢宠鏄庣粏", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
+    @GetMapping("/remove/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(serviceFunddetailService.removeByIds(Arrays.asList(ids)));
     }
@@ -117,8 +118,7 @@
      * 鍒犻櫎鎶ラ攢鐢宠鏄庣粏骞朵慨鏀归噾棰�
      */
     @ApiOperation("鍒犻櫎鎶ラ攢鐢宠鏄庣粏骞朵慨鏀归噾棰�")
-    @Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.DELETE)
-    @DeleteMapping("/deleteDetail/{id}")
+    @GetMapping("/deleteDetail/{id}")
     public AjaxResult deleteDetail(@PathVariable Long id) {
         return AjaxResult.success(serviceFunddetailService.deleteDetail(id));
     }
@@ -162,4 +162,26 @@
     public AjaxResult getFundDetail(@PathVariable("id") Long id) {
         return AjaxResult.success(serviceFunddetailService.getFundDetail(id));
     }
+
+    @ApiOperation("鏍规嵁鏉′欢绠楃◣")
+    @PostMapping("/calculateTax")
+    public AjaxResult calculateTax(@RequestBody List<ServiceFunddetail> serviceFunddetails) {
+        return AjaxResult.success(serviceFunddetailService.calculateTax(serviceFunddetails));
+    }
+
+//    /**
+//     * 缁╂晥璁$畻
+//     * <p>
+//     * beneficiaryNO  鍙楃泭浜虹紪鍙�
+//     */
+//    @ApiOperation("缁╂晥璁$畻")
+//    @PostMapping(value = "/performance")
+//    public AjaxResult performance(@RequestBody ServiceFunddetail serviceFunddetail) {
+//        if (StringUtils.isBlank(serviceFunddetail.getBeneficiaryno())) {
+//            return AjaxResult.error("鍙楃泭浜虹紪鍙蜂负绌�");
+//        }
+//
+//        return AjaxResult.success(serviceFunddetailService.performance(serviceFunddetail));
+//    }
+
 }

--
Gitblit v1.9.3