From d9125150245df9afe5e1b7cee1be3e9173943075 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 20 三月 2024 18:12:54 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 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 eb1ce2b..ca63645 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,10 @@
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.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 +17,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
@@ -66,17 +61,21 @@
// 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:query')")
+ @GetMapping(value = "/getInfo/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ ServiceFundtax serviceFundtax = serviceFundtaxService.getById(id);
+ ServiceFund serviceFund = new ServiceFund();
+ serviceFund.setFundTaxId(id);
+ serviceFundtax.setServiceFunds(serviceFundService.queryList(serviceFund));
+ return AjaxResult.success(serviceFundtax);
+ }
+
/**
* 淇敼涓撳璐圭敤绠楃◣鐢宠涓�
@@ -111,13 +110,16 @@
@PostMapping("/addFundTax")
public AjaxResult addFundTax(@RequestBody ServiceFundtax serviceFundtax) {
serviceFundtax.setTaxedtime(new Date());
- serviceFundtax.setApplyno(UUID.randomUUID().toString());
+
+ 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(serviceFundtax.getId().intValue());
+ Map<String, Long> map = new HashMap<>();
+ map.put("fundTaxId", serviceFundtax.getId());
+ return AjaxResult.success(map);
}
/**
--
Gitblit v1.9.3