From 55aac55195dc2bd404042ec099045fee8ac73e81 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 02 七月 2025 21:48:53 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 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 dccd9ee..4dc7e41 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
@@ -7,9 +7,13 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.FunddetailReqVo;
import com.ruoyi.project.domain.ServiceFunddetail;
+import com.ruoyi.project.domain.SpStatBonusReq;
+import com.ruoyi.project.domain.vo.TaxMoneyByItemEO;
+import com.ruoyi.project.domain.vo.TaxMoneySumEO;
import com.ruoyi.project.domain.vo.TaxMoneyVO;
import com.ruoyi.project.service.IServiceFunddetailService;
import io.swagger.annotations.Api;
@@ -18,8 +22,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
-import java.util.List;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.temporal.TemporalAdjusters;
+import java.util.*;
/**
* 璐圭敤鐢宠鏄庣粏Controller
@@ -40,7 +46,7 @@
* 鏌ヨ璐圭敤鐢宠鏄庣粏鍒楄〃
*/
@ApiOperation("鏌ヨ璐圭敤鐢宠鏄庣粏鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:funddetail:list')")
+ //// @PreAuthorize("@ss.hasPermi('project:funddetail:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceFunddetail serviceFunddetail) {
startPage();
@@ -53,7 +59,7 @@
* 瀵煎嚭璐圭敤鐢宠鏄庣粏鍒楄〃
*/
@ApiOperation("瀵煎嚭璐圭敤鐢宠鏄庣粏鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:funddetail:export')")
+ //// @PreAuthorize("@ss.hasPermi('project:funddetail:export')")
@Log(title = "璐圭敤鐢宠鏄庣粏", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceFunddetail serviceFunddetail) {
@@ -66,7 +72,7 @@
* 鑾峰彇璐圭敤鐢宠鏄庣粏璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇璐圭敤鐢宠鏄庣粏璇︾粏淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:funddetail:query')")
+ //// @PreAuthorize("@ss.hasPermi('project:funddetail:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceFunddetailService.getById(id));
@@ -76,19 +82,20 @@
* 鏂板璐圭敤鐢宠鏄庣粏
*/
@ApiOperation("鏂板璐圭敤鐢宠鏄庣粏")
- //@PreAuthorize("@ss.hasPermi('project:funddetail:add')")
+ //// @PreAuthorize("@ss.hasPermi('project:funddetail:add')")
@Log(title = "璐圭敤鐢宠鏄庣粏", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@NotRepeatCommit(key = "param:arg[1]", value = 30000)
public AjaxResult add(@RequestBody ServiceFunddetail serviceFunddetail) {
- return toAjax(serviceFunddetailService.save(serviceFunddetail));
+ boolean save = serviceFunddetailService.save(serviceFunddetail);
+ return AjaxResult.success(serviceFunddetail);
}
/**
* 淇敼璐圭敤鐢宠鏄庣粏
*/
@ApiOperation("淇敼璐圭敤鐢宠鏄庣粏")
- //@PreAuthorize("@ss.hasPermi('project:funddetail:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:funddetail:edit')")
@Log(title = "璐圭敤鐢宠鏄庣粏", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@NotRepeatCommit(key = "param:arg[1]", value = 30000)
@@ -101,7 +108,7 @@
* 鍒犻櫎璐圭敤鐢宠鏄庣粏
*/
@ApiOperation("鍒犻櫎璐圭敤鐢宠鏄庣粏")
- //@PreAuthorize("@ss.hasPermi('project:funddetail:remove')")
+ //// @PreAuthorize("@ss.hasPermi('project:funddetail:remove')")
@Log(title = "璐圭敤鐢宠鏄庣粏", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
@@ -158,11 +165,11 @@
return AjaxResult.success(serviceFunddetailService.getFundDetail(id));
}
- @ApiOperation("鏍规嵁鏉′欢绠楃◣")
- @PostMapping("/calculateTax")
- public AjaxResult calculateTax(@RequestBody List<ServiceFunddetail> serviceFunddetails) {
- return AjaxResult.success(serviceFunddetailService.calculateTax(serviceFunddetails));
- }
+// @ApiOperation("鏍规嵁鏉′欢绠楃◣")
+// @PostMapping("/calculateTax")
+// public AjaxResult calculateTax(@RequestBody List<ServiceFunddetail> serviceFunddetails) {
+// return AjaxResult.success(serviceFunddetailService.calculateTax2(serviceFunddetails));
+// }
// /**
// * 缁╂晥璁＄畻
@@ -179,4 +186,13 @@
// return AjaxResult.success(serviceFunddetailService.performance(serviceFunddetail));
// }
+ /**
+ * 鏌ヨ缁╂晥濂栭噾缁熻
+ */
+ @ApiOperation("鏌ヨ缁╂晥濂栭噾缁熻")
+ @PostMapping("/getListBySpStatBonus")
+ public TableDataInfo getListBySpStatBonus(@RequestBody SpStatBonusReq spStatBonusReq) {
+ startPage();
+ return getDataTable(serviceFunddetailService.getListBySpStatBonus(spStatBonusReq));
+ }
}
--
Gitblit v1.9.3