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/ServiceFundtaxController.java | 140 +++++++++++++++++++++++++++++-----------------
1 files changed, 89 insertions(+), 51 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 40d4b46..057affa 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,8 +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.service.IServiceFundService;
import com.ruoyi.project.service.IServiceFundtaxService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,84 +18,76 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
-import java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* 涓撳璐圭敤绠楃◣鐢宠涓籆ontroller
- *
+ *
* @author ruoyi
* @date 2024-03-13
*/
@Api("涓撳璐圭敤绠楃◣鐢宠涓�")
@RestController
-@RequestMapping("/system/fundtax")
-public class ServiceFundtaxController extends BaseController
-{
+@RequestMapping("/project/fundtax")
+public class ServiceFundtaxController extends BaseController {
@Autowired
private IServiceFundtaxService serviceFundtaxService;
+
+ @Autowired
+ private IServiceFundService serviceFundService;
+
/**
* 鏌ヨ涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�
*/
@ApiOperation("鏌ヨ涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�")
- @PreAuthorize("@ss.hasPermi('system:fundtax:list')")
@GetMapping("/list")
- public TableDataInfo list(ServiceFundtax serviceFundtax)
- {
+ 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 = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return AjaxResult.success(serviceFundtaxService.getById(id));
+ @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);
}
- /**
- * 鏂板涓撳璐圭敤绠楃◣鐢宠涓�
- */
- @ApiOperation("鏂板涓撳璐圭敤绠楃◣鐢宠涓�")
- @PreAuthorize("@ss.hasPermi('system:fundtax:add')")
- @Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.INSERT)
- @PostMapping
- @RepeatSubmit
- public AjaxResult add(@RequestBody ServiceFundtax serviceFundtax)
- {
- return toAjax(serviceFundtaxService.save(serviceFundtax));
- }
/**
* 淇敼涓撳璐圭敤绠楃◣鐢宠涓�
*/
@ApiOperation("淇敼涓撳璐圭敤绠楃◣鐢宠涓�")
- @PreAuthorize("@ss.hasPermi('system:fundtax:edit')")
@Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.UPDATE)
- @PutMapping
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceFundtax serviceFundtax)
- {
+ @PostMapping("/edit")
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceFundtax serviceFundtax) {
return toAjax(serviceFundtaxService.updateById(serviceFundtax));
}
@@ -100,11 +95,54 @@
* 鍒犻櫎涓撳璐圭敤绠楃◣鐢宠涓�
*/
@ApiOperation("鍒犻櫎涓撳璐圭敤绠楃◣鐢宠涓�")
- @PreAuthorize("@ss.hasPermi('system:fundtax:remove')")
@Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(serviceFundtaxService.removeByIds(Arrays.asList(ids)));
+ @GetMapping("/remove/{id}")
+ public AjaxResult remove(@PathVariable Long id) {
+ return toAjax(serviceFundtaxService.removeById(id));
+ }
+
+
+ /**
+ * 鏂板涓撳璐圭敤绠楃◣鐢宠涓�
+ */
+ @ApiOperation("鏂板涓撳璐圭敤绠楃◣鐢宠涓�")
+ @Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.INSERT)
+ @PostMapping("/addFundTax")
+ public AjaxResult addFundTax(@RequestBody ServiceFundtax serviceFundtax) {
+ serviceFundtax.setTaxedtime(new Date());
+
+ serviceFundtax.setApplyno(new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()));
+ serviceFundtaxService.save(serviceFundtax);
+ for (ServiceFund serviceFund : serviceFundtax.getServiceFunds()) {
+ serviceFund.setFundTaxId(serviceFundtax.getId());
+ serviceFundService.updateById(serviceFund);
+ }
+ Map<String, Long> map = new HashMap<>();
+ map.put("fundTaxId", serviceFundtax.getId());
+ return AjaxResult.success(map);
+ }
+
+ /**
+ * 鑾峰彇fundTaxid鐨勬渶澶у��
+ *
+ * @return
+ */
+ @ApiOperation("鑾峰彇fundTaxid鐨勬渶澶у��")
+ @GetMapping(value = "/getMaxFundTaxId")
+ public AjaxResult getMaxFundTaxId() {
+ Integer maxFundTaxId = serviceFundtaxService.getMaxFundTaxId();
+ return success(maxFundTaxId.toString());
+ }
+
+ /**
+ * 鎵归噺绠楃◣
+ *
+ * @param fundTaxVO
+ * @return
+ */
+ @ApiOperation("鎵归噺绠楃◣")
+ @PostMapping(value = "/batchFundTax")
+ public AjaxResult batchFundTax(@RequestBody FundTaxVO fundTaxVO) {
+ return toAjax(serviceFundtaxService.batchFundTax(fundTaxVO));
}
}
--
Gitblit v1.9.3