From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java
index e3929d2..07154a0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java
@@ -6,6 +6,7 @@
import com.alibaba.excel.event.AnalysisEventListener;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.WebUtils;
import com.ruoyi.system.importExcel.TBankFlowImportExcel;
import com.ruoyi.system.model.TBankFlow;
@@ -15,10 +16,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@@ -84,7 +82,6 @@
list.clear();
}
}
-
@Override
public void doAfterAllAnalysed(AnalysisContext context) {
int size = list.size();
@@ -93,12 +90,11 @@
}
}
}).sheet().doRead();
-
-
// 导出导入结果
HttpServletResponse response = WebUtils.response();
- response.setContentType("application/vnd.ms-excel;charset=utf-8");
+ response.setContentType("application/vnd.ms-excel;charset=UTF-8");
response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
+ response.setHeader("Pragma", "no-cache");
if (failList.size() > 0) {
EasyExcel.write(response.getOutputStream(), TBankFlowImportExcel.class).sheet("Sheet1").doWrite(failList);
} else {
@@ -107,12 +103,19 @@
failList.add(result);
EasyExcel.write(response.getOutputStream(), TBankFlowImportExcel.class).sheet("Sheet1").doWrite(failList);
}
-
} catch (Exception e) {
e.printStackTrace();
System.err.println("银行流水返回结果导出失败");
}
}
+
+ @GetMapping("getByBankSerialNumber")
+ public R<List<TBankFlow>> searchByBankSerialNumber(@RequestParam String bankSerialNumber){
+ List<TBankFlow> tBankFlows = flowService.searchByBankSerialNumber(bankSerialNumber);
+ return R.ok(tBankFlows);
+ }
+
+
}
--
Gitblit v1.7.1