From 3db944578af704f433fc6f4bc37180c8fed48ce9 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 16 十二月 2023 10:40:51 +0800
Subject: [PATCH] 代码提交，添加apply_time
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 c4f23c9..a3aaae5 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
@@ -4,6 +4,7 @@
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;
@@ -481,6 +482,7 @@
* 瀹℃牳璐圭敤
*/
@ApiOperation("瀹℃牳璐圭敤")
+ @RepeatSubmit
// @Log(title = "瀹℃牳璐圭敤", businessType = BusinessType.OTHER)
@PostMapping("/checkfund")
public AjaxResult checkFund(@RequestBody CheckFundVO checkFundVO) {
@@ -494,7 +496,6 @@
serviceFundflowrule.setApplytype(serviceFund.getApplytype());
serviceFundflowrule.setCheckuserno(loginUser.getUsername());
log.info("serviceFundController---checkFund---queryList鐨勫叆鍙傚�約erviceFundflowrule:{}", serviceFundflowrule);
-
List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
if (serviceFundflowrules == null || serviceFundflowrules.stream().count() == 0) {
@@ -647,6 +648,7 @@
return toAjax(false);
}
for (ServiceFund sf : infoByInfoIdList) {
+ sf.setApplyTime(new Date());
//濡傛灉绛変簬100锛岃鏄庡凡缁忚蛋鍒板尰闄㈣储鍔￠偅杈逛簡锛涜储鍔￠偅杈瑰彇鏁版嵁鏄粠鍒嗕韩琛ㄥ彇锛屾墍浠ワ紝杩欓噷鐩存帴寰�鍒嗕韩琛ㄩ噷娣诲姞鏁版嵁灏辫浜�
if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 199) {
//灏唂und琛ㄧ殑瀹℃牳鐘舵�佹敼鎴�100
@@ -2099,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) {
@@ -2123,10 +2126,10 @@
/**
* 鍚堣涓◣
*/
+ @NotRepeatCommit(key = "param:arg[1]", value = 30000)
@ApiOperation("鍚堣涓◣")
@Log(title = "鍚堣涓◣", businessType = BusinessType.INSERT)
@PostMapping("/totaltax")
- @RepeatSubmit
public AjaxResult totaltax(@RequestBody TotalTaxVO totalTaxVO) {
Map<String, List<ServiceFunddetailExcel>> totaltax = serviceFundService.totaltax(totalTaxVO);
if (ObjectUtils.isEmpty(totaltax)) {
@@ -2139,7 +2142,13 @@
key2 = key;
}
ExcelUtil<ServiceFunddetailExcel> util = new ExcelUtil<ServiceFunddetailExcel>(ServiceFunddetailExcel.class);
- return AjaxResult.success(util.exportExcel(totaltax.get(key2), key2));
+ 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