From 2825e5d603737bc596c0aca6c39929949ac240c7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 22 四月 2024 09:06:26 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java | 66 +++++++++++++++++----------------
1 files changed, 34 insertions(+), 32 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..c11b8ad 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
@@ -6,13 +6,11 @@
import com.ruoyi.common.core.domain.AjaxResult;
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.ServiceDonateannex;
import com.ruoyi.project.domain.ServiceFund;
import com.ruoyi.project.domain.ServiceFundtax;
import com.ruoyi.project.domain.vo.FundTaxVO;
-import com.ruoyi.project.domain.vo.TotalTaxVO;
import com.ruoyi.project.service.IServiceFundService;
-import com.ruoyi.project.service.IServiceFunddetailService;
import com.ruoyi.project.service.IServiceFundtaxService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -20,10 +18,8 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* 涓撳璐圭敤绠楃◣鐢宠涓籆ontroller
@@ -46,42 +42,48 @@
* 鏌ヨ涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�
*/
@ApiOperation("鏌ヨ涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�")
- @PreAuthorize("@ss.hasPermi('system:fundtax:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceFundtax serviceFundtax) {
startPage();
List<ServiceFundtax> list = serviceFundtaxService.queryList(serviceFundtax);
+ Collections.sort(list, (sft1, sft2) -> {
+ Long i = sft2.getId() - sft1.getId();
+ return i.intValue();
+ });
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: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));
+ ServiceFundtax serviceFundtax = serviceFundtaxService.getById(id);
+ ServiceFund serviceFund = new ServiceFund();
+ serviceFund.setFundTaxId(id);
+ serviceFundtax.setServiceFunds(serviceFundService.queryList(serviceFund));
+ return AjaxResult.success(serviceFundtax);
}
+
/**
* 淇敼涓撳璐圭敤绠楃◣鐢宠涓�
*/
@ApiOperation("淇敼涓撳璐圭敤绠楃◣鐢宠涓�")
- @PreAuthorize("@ss.hasPermi('system:fundtax:edit')")
@Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@RepeatSubmit
@@ -93,7 +95,6 @@
* 鍒犻櫎涓撳璐圭敤绠楃◣鐢宠涓�
*/
@ApiOperation("鍒犻櫎涓撳璐圭敤绠楃◣鐢宠涓�")
- @PreAuthorize("@ss.hasPermi('system:fundtax:remove')")
@Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{id}")
public AjaxResult remove(@PathVariable Long id) {
@@ -105,19 +106,20 @@
* 鏂板涓撳璐圭敤绠楃◣鐢宠涓�
*/
@ApiOperation("鏂板涓撳璐圭敤绠楃◣鐢宠涓�")
- @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) {
+
+ serviceFundtax.setApplyno(new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()));
+ serviceFundtaxService.save(serviceFundtax);
+ for (ServiceFund serviceFund : serviceFundtax.getServiceFunds()) {
serviceFund.setFundTaxId(serviceFundtax.getId());
serviceFundService.updateById(serviceFund);
}
- return toAjax(save);
+ Map<String, Long> map = new HashMap<>();
+ map.put("fundTaxId", serviceFundtax.getId());
+ return AjaxResult.success(map);
}
/**
--
Gitblit v1.9.3