From 054cfdd53b732d2f60627fc9ac7cf92233d3c200 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 17 十一月 2023 16:17:56 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
index 163df46..b4e3261 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -1,8 +1,10 @@
package com.ruoyi.web.controller.project;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.HttpStatus;
@@ -13,6 +15,7 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.tax.TaxtUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -479,6 +482,7 @@
* 瀹℃牳璐圭敤
*/
@ApiOperation("瀹℃牳璐圭敤")
+ @RepeatSubmit
// @Log(title = "瀹℃牳璐圭敤", businessType = BusinessType.OTHER)
@PostMapping("/checkfund")
public AjaxResult checkFund(@RequestBody CheckFundVO checkFundVO) {
@@ -531,6 +535,18 @@
serviceFund.setFlowlevel(100L);
serviceFund.setRecordstatus(99);
serviceFundService.updateById(serviceFund);
+
+ //淇濆瓨瀹℃壒娴佺▼琛�
+ ServiceFundflow serviceFundflow = new ServiceFundflow();
+ SysUser user = loginUser.getUser();
+ serviceFundflow.setFundid(serviceFund.getId());
+ serviceFundflow.setCheckuserno(user.getUserName());
+ serviceFundflow.setCheckusername(user.getNickName());
+ serviceFundflow.setFundtype(2);
+ serviceFundflow.setApplytype(serviceFund.getApplytype());
+ serviceFundflow.setFlowconclusion(CheckFlag);
+ serviceFundflow.setFlowcontent("閫氳繃");
+ Boolean aBoolean = serviceFundflowService.saveData(serviceFundflow);
return AjaxResult.success();
}
//璁板綍涓�涓嬶紝涓嬩竴绾х殑瀹℃壒锛屼互渚夸簬涓嬩竴绾ч��鍥炲悗锛屽彂璧疯�呮彁浜ゆ椂锛岃兘鍐嶆彁鍒板綋鍓嶅鎵瑰眰绾�
@@ -692,6 +708,7 @@
return toAjax(false);
}
+
/**
* 鍒犻櫎璐圭敤鐢宠涓�
@@ -2084,6 +2101,7 @@
/**
* 璐圭敤绫诲瀷璁℃暟
*/
+// @NotRepeatCommit(key = "param:arg[1]", value = 30000)
@ApiOperation("璐圭敤绫诲瀷璁℃暟")
@GetMapping(value = "/countItem/{infoid}/{itemid}")
public AjaxResult countItem(@PathVariable Long infoid, @PathVariable Long itemid) {
@@ -2105,4 +2123,34 @@
return AjaxResult.success(serviceFundService.performance(serviceFundVO));
}
+ /**
+ * 鍚堣涓◣
+ */
+ @NotRepeatCommit(key = "param:arg[1]", value = 30000)
+ @ApiOperation("鍚堣涓◣")
+ @Log(title = "鍚堣涓◣", businessType = BusinessType.INSERT)
+ @PostMapping("/totaltax")
+ public AjaxResult totaltax(@RequestBody TotalTaxVO totalTaxVO) {
+ Map<String, List<ServiceFunddetailExcel>> totaltax = serviceFundService.totaltax(totalTaxVO);
+ if (ObjectUtils.isEmpty(totaltax)) {
+ throw new BaseException("鍚堣涓◣澶辫触");
+ }
+
+ Set<String> strings = totaltax.keySet();
+ String key2 = null;
+ for (String key : strings) {
+ key2 = key;
+ }
+ ExcelUtil<ServiceFunddetailExcel> util = new ExcelUtil<ServiceFunddetailExcel>(ServiceFunddetailExcel.class);
+ AjaxResult ajaxResult = util.exportExcel(totaltax.get(key2), key2);
+ String msg = (String) ajaxResult.get("msg");
+
+ Map dataMap = new HashMap();
+ dataMap.put("downloadUrl", "/profile/download/" + msg);
+
+ return AjaxResult.success(dataMap);
+
+
+ }
+
}
--
Gitblit v1.9.3