From 4c42cd3d556ea72d70ea43a734cc38acd6b81e74 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 15 三月 2024 18:26:43 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java | 103 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 71 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 40d4b46..8cb1ee2 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
@@ -7,7 +7,12 @@
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;
@@ -16,21 +21,26 @@
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
+import java.util.UUID;
/**
* 涓撳璐圭敤绠楃◣鐢宠涓籆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;
+
/**
* 鏌ヨ涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�
@@ -38,8 +48,7 @@
@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);
return getDataTable(list);
@@ -52,8 +61,7 @@
@PreAuthorize("@ss.hasPermi('system:fundtax:export')")
@Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceFundtax serviceFundtax)
- {
+ public AjaxResult export(ServiceFundtax serviceFundtax) {
List<ServiceFundtax> list = serviceFundtaxService.queryList(serviceFundtax);
ExcelUtil<ServiceFundtax> util = new ExcelUtil<ServiceFundtax>(ServiceFundtax.class);
return util.exportExcel(list, "涓撳璐圭敤绠楃◣鐢宠涓绘暟鎹�");
@@ -64,23 +72,9 @@
*/
@ApiOperation("鑾峰彇涓撳璐圭敤绠楃◣鐢宠涓昏缁嗕俊鎭�")
@PreAuthorize("@ss.hasPermi('system:fundtax:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ @GetMapping(value = "/getInfo/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceFundtaxService.getById(id));
- }
-
- /**
- * 鏂板涓撳璐圭敤绠楃◣鐢宠涓�
- */
- @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));
}
/**
@@ -89,10 +83,9 @@
@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));
}
@@ -102,9 +95,55 @@
@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) {
+ ServiceFundtax serviceFundtax = new ServiceFundtax();
+ serviceFundtax.setDel_flag(1);
+ serviceFundtax.setId(id);
+ return toAjax(serviceFundtaxService.updateById(serviceFundtax));
+ }
+
+
+ /**
+ * 鏂板涓撳璐圭敤绠楃◣鐢宠涓�
+ */
+ @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();
+ serviceFundtax.setTaxedtime(new Date());
+ serviceFundtax.setApplyno(UUID.randomUUID().toString());
+ boolean save = serviceFundtaxService.save(serviceFundtax);
+ for (ServiceFund serviceFund : fundList) {
+ serviceFund.setFundTaxId(serviceFundtax.getId());
+ serviceFundService.updateById(serviceFund);
+ }
+ return toAjax(save);
+ }
+
+ /**
+ * 鑾峰彇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