From b6dd47b05107fc36d8ff4f7f29a4446521f95503 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 02 一月 2025 18:44:28 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java |  166 ++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 109 insertions(+), 57 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 8478697..d08876e 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,48 +1,39 @@
 package com.ruoyi.web.controller.project;
 
-import java.io.*;
-import java.util.*;
-
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.project.domain.ServiceFund;
-import freemarker.template.Configuration;
-import freemarker.template.Template;
-import freemarker.template.TemplateException;
-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.NotRepeatCommit;
 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.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.TaxMoneyVO;
+import com.ruoyi.project.service.IServiceFunddetailService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 璐圭敤鐢宠鏄庣粏Controller
- * 
+ *
  * @author ruoyi
  * @date 2022-01-25
  */
+@Slf4j
 @Api("璐圭敤鐢宠鏄庣粏")
 @RestController
 @RequestMapping("/project/funddetail")
-public class ServiceFunddetailController extends BaseController
-{
+public class ServiceFunddetailController extends BaseController {
     @Autowired
     private IServiceFunddetailService serviceFunddetailService;
 
@@ -51,10 +42,9 @@
      * 鏌ヨ璐圭敤鐢宠鏄庣粏鍒楄〃
      */
     @ApiOperation("鏌ヨ璐圭敤鐢宠鏄庣粏鍒楄〃")
-    //@PreAuthorize("@ss.hasPermi('project:funddetail:list')")
+    //// @PreAuthorize("@ss.hasPermi('project:funddetail:list')")
     @GetMapping("/list")
-    public TableDataInfo list(ServiceFunddetail serviceFunddetail)
-    {
+    public TableDataInfo list(ServiceFunddetail serviceFunddetail) {
         startPage();
         //List<ServiceFunddetail> list = serviceFunddetailService.queryList(serviceFunddetail);
         List<ServiceFunddetail> list = serviceFunddetailService.selectServiceFunddetailList(serviceFunddetail);
@@ -65,11 +55,10 @@
      * 瀵煎嚭璐圭敤鐢宠鏄庣粏鍒楄〃
      */
     @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)
-    {
+    public AjaxResult export(ServiceFunddetail serviceFunddetail) {
         List<ServiceFunddetail> list = serviceFunddetailService.queryList(serviceFunddetail);
         ExcelUtil<ServiceFunddetail> util = new ExcelUtil<ServiceFunddetail>(ServiceFunddetail.class);
         return util.exportExcel(list, "璐圭敤鐢宠鏄庣粏鏁版嵁");
@@ -79,10 +68,9 @@
      * 鑾峰彇璐圭敤鐢宠鏄庣粏璇︾粏淇℃伅
      */
     @ApiOperation("鑾峰彇璐圭敤鐢宠鏄庣粏璇︾粏淇℃伅")
-    //@PreAuthorize("@ss.hasPermi('project:funddetail:query')")
+    //// @PreAuthorize("@ss.hasPermi('project:funddetail:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(serviceFunddetailService.getById(id));
     }
 
@@ -90,25 +78,25 @@
      * 鏂板璐圭敤鐢宠鏄庣粏
      */
     @ApiOperation("鏂板璐圭敤鐢宠鏄庣粏")
-    //@PreAuthorize("@ss.hasPermi('project:funddetail:add')")
+    //// @PreAuthorize("@ss.hasPermi('project:funddetail:add')")
     @Log(title = "璐圭敤鐢宠鏄庣粏", businessType = BusinessType.INSERT)
-    @PostMapping
-    @RepeatSubmit
-    public AjaxResult add(@RequestBody ServiceFunddetail serviceFunddetail)
-    {
-        return toAjax(serviceFunddetailService.save(serviceFunddetail));
+    @PostMapping("/add")
+    @NotRepeatCommit(key = "param:arg[1]", value = 30000)
+    public AjaxResult add(@RequestBody ServiceFunddetail 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)
-    @PutMapping
-    @RepeatSubmit    
-    public AjaxResult edit(@RequestBody ServiceFunddetail serviceFunddetail)
-    {
+    @PostMapping("/edit")
+    @NotRepeatCommit(key = "param:arg[1]", value = 30000)
+    public AjaxResult edit(@RequestBody ServiceFunddetail serviceFunddetail) {
+        log.info("淇敼鐨勬暟鎹俊鎭細{}", serviceFunddetail);
         return toAjax(serviceFunddetailService.updateById(serviceFunddetail));
     }
 
@@ -116,11 +104,10 @@
      * 鍒犻櫎璐圭敤鐢宠鏄庣粏
      */
     @ApiOperation("鍒犻櫎璐圭敤鐢宠鏄庣粏")
-    //@PreAuthorize("@ss.hasPermi('project:funddetail:remove')")
+    //// @PreAuthorize("@ss.hasPermi('project:funddetail:remove')")
     @Log(title = "璐圭敤鐢宠鏄庣粏", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(serviceFunddetailService.removeByIds(Arrays.asList(ids)));
     }
 
@@ -129,14 +116,79 @@
      * 鍒犻櫎鎶ラ攢鐢宠鏄庣粏骞朵慨鏀归噾棰�
      */
     @ApiOperation("鍒犻櫎鎶ラ攢鐢宠鏄庣粏骞朵慨鏀归噾棰�")
-    @Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.DELETE)
-    @DeleteMapping("/deleteDetail/{id}")
-    public AjaxResult deleteDetail(@PathVariable Long id)
-    {
+    @GetMapping("/deleteDetail/{id}")
+    public AjaxResult deleteDetail(@PathVariable Long id) {
         return AjaxResult.success(serviceFunddetailService.deleteDetail(id));
     }
 
+    /**
+     * 鏍规嵁鍙楃泭浜虹紪鍙疯幏鍙栬垂鐢ㄧ敵璇锋槑缁嗕俊鎭�
+     */
+    @ApiOperation("鏍规嵁鍙楃泭浜鸿韩浠借瘉鍙疯幏鍙栬垂鐢ㄧ敵璇锋槑缁嗕俊鎭�")
+    @PostMapping("/getDataBybeneficiaryNo")
+    public AjaxResult getDataBybeneficiaryNo(@RequestBody FunddetailReqVo funddetailReqVo) {
+        List<ServiceFunddetail> dataBybeneficiaryNo = serviceFunddetailService.getDataBybeneficiaryNo(funddetailReqVo);
+        return AjaxResult.success(dataBybeneficiaryNo);
+    }
+
+    /**
+     * 鏍规嵁鍙楃泭浜鸿韩浠借瘉缂栧彿鑾峰彇绋庤垂閲戦
+     *
+     * @param taxMoneyVo 韬唤璇佺紪鍙�
+     * @return
+     */
+    @ApiOperation("鏍规嵁鍙楃泭浜鸿韩浠借瘉缂栧彿鑾峰彇绋庤垂閲戦")
+    @PostMapping("/getTaxByBeneFiciaryNo")
+    public AjaxResult getTaxBeforeByBeneFiciaryNo(@RequestBody TaxMoneyVO taxMoneyVo) {
+        return AjaxResult.success(serviceFunddetailService.getTaxByBeneFiciaryNo(taxMoneyVo));
+    }
+
+    /**
+     * 鏍规嵁绋庡悗閲戦鑾峰彇绋庡墠閲戦
+     *
+     * @param taxMoneyVo 绋庡悗宸ヨ祫
+     * @return
+     */
+    @ApiOperation("鏍规嵁绋庡悗宸ヨ祫鑾峰彇绋庡墠閲戦")
+    @PostMapping("/getTaxBeforeByAfterMoney")
+    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));
+//    }
+
+    /**
+     * 鏌ヨ缁╂晥濂栭噾缁熻
+     */
+    @ApiOperation("鏌ヨ缁╂晥濂栭噾缁熻")
+    @PostMapping("/getListBySpStatBonus")
+    public TableDataInfo getListBySpStatBonus(@RequestBody SpStatBonusReq spStatBonusReq) {
+        startPage();
+        return getDataTable(serviceFunddetailService.getListBySpStatBonus(spStatBonusReq));
+    }
 }

--
Gitblit v1.9.3