From b113be4dfacb8ce58789b12e8beca6cd9ba8fb3c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 07 九月 2023 16:58:42 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java |   78 +++++++++++++++++++++++++--------------
 1 files changed, 50 insertions(+), 28 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..3bef97c 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,13 +3,8 @@
 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 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;
@@ -34,15 +29,14 @@
 
 /**
  * 璐圭敤鐢宠鏄庣粏Controller
- * 
+ *
  * @author ruoyi
  * @date 2022-01-25
  */
 @Api("璐圭敤鐢宠鏄庣粏")
 @RestController
 @RequestMapping("/project/funddetail")
-public class ServiceFunddetailController extends BaseController
-{
+public class ServiceFunddetailController extends BaseController {
     @Autowired
     private IServiceFunddetailService serviceFunddetailService;
 
@@ -53,8 +47,7 @@
     @ApiOperation("鏌ヨ璐圭敤鐢宠鏄庣粏鍒楄〃")
     //@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);
@@ -68,8 +61,7 @@
     //@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, "璐圭敤鐢宠鏄庣粏鏁版嵁");
@@ -81,8 +73,7 @@
     @ApiOperation("鑾峰彇璐圭敤鐢宠鏄庣粏璇︾粏淇℃伅")
     //@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));
     }
 
@@ -94,8 +85,7 @@
     @Log(title = "璐圭敤鐢宠鏄庣粏", businessType = BusinessType.INSERT)
     @PostMapping
     @RepeatSubmit
-    public AjaxResult add(@RequestBody ServiceFunddetail serviceFunddetail)
-    {
+    public AjaxResult add(@RequestBody ServiceFunddetail serviceFunddetail) {
         return toAjax(serviceFunddetailService.save(serviceFunddetail));
     }
 
@@ -106,9 +96,8 @@
     //@PreAuthorize("@ss.hasPermi('project:funddetail:edit')")
     @Log(title = "璐圭敤鐢宠鏄庣粏", businessType = BusinessType.UPDATE)
     @PutMapping
-    @RepeatSubmit    
-    public AjaxResult edit(@RequestBody ServiceFunddetail serviceFunddetail)
-    {
+    @RepeatSubmit
+    public AjaxResult edit(@RequestBody ServiceFunddetail serviceFunddetail) {
         return toAjax(serviceFunddetailService.updateById(serviceFunddetail));
     }
 
@@ -119,8 +108,7 @@
     //@PreAuthorize("@ss.hasPermi('project:funddetail:remove')")
     @Log(title = "璐圭敤鐢宠鏄庣粏", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(serviceFunddetailService.removeByIds(Arrays.asList(ids)));
     }
 
@@ -129,14 +117,48 @@
      * 鍒犻櫎鎶ラ攢鐢宠鏄庣粏骞朵慨鏀归噾棰�
      */
     @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));
+    }
 }

--
Gitblit v1.9.3