From fa8521a23af37854e7a23d35467147bd00e008b2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 14 九月 2023 18:57:31 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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 5e5ec5a..69d353b 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
@@ -95,7 +95,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 +107,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 +117,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));
}
@@ -140,15 +139,15 @@
* @return
*/
@ApiOperation("鏍规嵁鍙楃泭浜虹紪鍙疯幏鍙栫◣璐归噾棰�")
- @PostMapping("/getTaxBeforeByBeneFiciaryNo")
+ @PostMapping("/getTaxByBeneFiciaryNo")
public AjaxResult getTaxBeforeByBeneFiciaryNo(@RequestBody TaxMoneyVO taxMoneyVo) {
- return AjaxResult.success(serviceFunddetailService.getTaxBeforeByBeneFiciaryNo(taxMoneyVo));
+ return AjaxResult.success(serviceFunddetailService.getTaxByBeneFiciaryNo(taxMoneyVo));
}
/**
* 鏍规嵁绋庡悗閲戦鑾峰彇绋庡墠閲戦
*
- * @param money 绋庡悗宸ヨ祫
+ * @param taxMoneyVo 绋庡悗宸ヨ祫
* @return
*/
@ApiOperation("鏍规嵁绋庡悗宸ヨ祫鑾峰彇绋庡墠閲戦")
@@ -156,4 +155,16 @@
public AjaxResult getTaxBeforeByAfterMoney(@RequestBody TaxMoneyVO taxMoneyVo) {
return AjaxResult.success(serviceFunddetailService.getTaxBeforeByAfterMoney(taxMoneyVo));
}
+
+
+ @GetMapping("/getFundDetail/{id}")
+ 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));
+ }
}
--
Gitblit v1.9.3