From 519886a70d630e3cdd6c0f40f55fcebc6e780dc5 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 19 三月 2024 17:45:11 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java
index 348e725..eb1ce2b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java
@@ -53,29 +53,30 @@
List<ServiceFundtax> list = serviceFundtaxService.queryList(serviceFundtax);
return getDataTable(list);
}
-
- /**
- * 瀵煎嚭涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�
- */
- @ApiOperation("瀵煎嚭涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�")
- @PreAuthorize("@ss.hasPermi('system:fundtax:export')")
- @Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.EXPORT)
- @GetMapping("/export")
- public AjaxResult export(ServiceFundtax serviceFundtax) {
- List<ServiceFundtax> list = serviceFundtaxService.queryList(serviceFundtax);
- ExcelUtil<ServiceFundtax> util = new ExcelUtil<ServiceFundtax>(ServiceFundtax.class);
- return util.exportExcel(list, "涓撳璐圭敤绠楃◣鐢宠涓绘暟鎹�");
- }
-
- /**
- * 鑾峰彇涓撳璐圭敤绠楃◣鐢宠涓昏缁嗕俊鎭�
- */
- @ApiOperation("鑾峰彇涓撳璐圭敤绠楃◣鐢宠涓昏缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:fundtax:query')")
- @GetMapping(value = "/getInfo/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id) {
- return AjaxResult.success(serviceFundtaxService.getById(id));
- }
+//
+// /**
+// * 瀵煎嚭涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�
+// */
+// @ApiOperation("瀵煎嚭涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�")
+// @PreAuthorize("@ss.hasPermi('system:fundtax:export')")
+// @Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.EXPORT)
+// @GetMapping("/export")
+// public AjaxResult export(ServiceFundtax serviceFundtax) {
+// List<ServiceFundtax> list = serviceFundtaxService.queryList(serviceFundtax);
+// ExcelUtil<ServiceFundtax> util = new ExcelUtil<ServiceFundtax>(ServiceFundtax.class);
+// return util.exportExcel(list, "涓撳璐圭敤绠楃◣鐢宠涓绘暟鎹�");
+// }
+//
+// /**
+// * 鑾峰彇涓撳璐圭敤绠楃◣鐢宠涓昏缁嗕俊鎭�
+// */
+// @ApiOperation("鑾峰彇涓撳璐圭敤绠楃◣鐢宠涓昏缁嗕俊鎭�")
+// @PreAuthorize("@ss.hasPermi('system:fundtax:query')")
+// @GetMapping(value = "/getInfo/{id}")
+// public AjaxResult getInfo(@PathVariable("id") Long id) {
+// return AjaxResult.success(serviceFundtaxService.getById(id));
+// }
+//
/**
* 淇敼涓撳璐圭敤绠楃◣鐢宠涓�
@@ -108,16 +109,15 @@
@PreAuthorize("@ss.hasPermi('system:fundtax:add')")
@Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.INSERT)
@PostMapping("/addFundTax")
- public AjaxResult addFundTax(@RequestBody List<ServiceFund> fundList) {
- ServiceFundtax serviceFundtax = new ServiceFundtax();
+ public AjaxResult addFundTax(@RequestBody ServiceFundtax serviceFundtax) {
serviceFundtax.setTaxedtime(new Date());
serviceFundtax.setApplyno(UUID.randomUUID().toString());
- boolean save = serviceFundtaxService.save(serviceFundtax);
- for (ServiceFund serviceFund : fundList) {
+ serviceFundtaxService.save(serviceFundtax);
+ for (ServiceFund serviceFund : serviceFundtax.getServiceFunds()) {
serviceFund.setFundTaxId(serviceFundtax.getId());
serviceFundService.updateById(serviceFund);
}
- return toAjax(save);
+ return toAjax(serviceFundtax.getId().intValue());
}
/**
--
Gitblit v1.9.3