From 6f344e6360751574f7e03b21c00cfa3f4b2bc099 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 10 十一月 2023 15:41:41 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java | 83 +++++++++++++++++++++++++----------------
1 files changed, 51 insertions(+), 32 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..8e0fec5 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
@@ -1,31 +1,23 @@
package com.ruoyi.web.controller.project;
-import java.io.*;
-import java.util.*;
-
-import com.ruoyi.project.domain.FunddetailReqVo;
-import com.ruoyi.project.domain.vo.TaxMoneyVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.project.domain.ServiceFunddetail;
-import com.ruoyi.project.service.IServiceFunddetailService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.domain.FunddetailReqVo;
+import com.ruoyi.project.domain.ServiceFunddetail;
+import com.ruoyi.project.domain.vo.TaxMoneyVO;
+import com.ruoyi.project.service.IServiceFunddetailService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
/**
* 璐圭敤鐢宠鏄庣粏Controller
@@ -95,7 +87,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 +99,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 +109,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));
}
@@ -126,7 +117,7 @@
/**
* 鏍规嵁鍙楃泭浜虹紪鍙疯幏鍙栬垂鐢ㄧ敵璇锋槑缁嗕俊鎭�
*/
- @ApiOperation("鏍规嵁鍙楃泭浜虹紪鍙疯幏鍙栬垂鐢ㄧ敵璇锋槑缁嗕俊鎭�")
+ @ApiOperation("鏍规嵁鍙楃泭浜鸿韩浠借瘉鍙疯幏鍙栬垂鐢ㄧ敵璇锋槑缁嗕俊鎭�")
@PostMapping("/getDataBybeneficiaryNo")
public AjaxResult getDataBybeneficiaryNo(@RequestBody FunddetailReqVo funddetailReqVo) {
List<ServiceFunddetail> dataBybeneficiaryNo = serviceFunddetailService.getDataBybeneficiaryNo(funddetailReqVo);
@@ -134,21 +125,21 @@
}
/**
- * 鏍规嵁鍙楃泭浜虹紪鍙疯幏鍙栫◣璐归噾棰�
+ * 鏍规嵁鍙楃泭浜鸿韩浠借瘉缂栧彿鑾峰彇绋庤垂閲戦
*
- * @param taxMoneyVo 鍙楃泭浜虹紪鍙�
+ * @param taxMoneyVo 韬唤璇佺紪鍙�
* @return
*/
- @ApiOperation("鏍规嵁鍙楃泭浜虹紪鍙疯幏鍙栫◣璐归噾棰�")
- @PostMapping("/getTaxBeforeByBeneFiciaryNo")
+ @ApiOperation("鏍规嵁鍙楃泭浜鸿韩浠借瘉缂栧彿鑾峰彇绋庤垂閲戦")
+ @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 +147,32 @@
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));
+ }
+
+// /**
+// * 缁╂晥璁＄畻
+// * <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