diff --git a/src/main/java/com/api/bokang/xiao/pyzl/controller/GetDocController.java b/src/main/java/com/api/bokang/xiao/pyzl/controller/GetDocController.java
new file mode 100644
index 0000000..c36c29c
--- /dev/null
+++ b/src/main/java/com/api/bokang/xiao/pyzl/controller/GetDocController.java
@@ -0,0 +1,48 @@
+package com.api.bokang.xiao.pyzl.controller;
+
+import aiyh.utils.Util;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import org.apache.log4j.Logger;
+import weaver.conn.RecordSet;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+
+/**
+ * @ClassName GetDocController
+ * @Author 肖博亢
+ * @Date 2023/6/19 12:32
+ * @Description
+ **/
+
+@Path("/xbk/pyzl")
+public class GetDocController {
+
+ private final Logger log = Util.getLogger();
+
+ @POST
+ @Path("/abideBy")
+ @Produces({"text/plain"})
+ public String getAbideBy(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+ String secId = Util.null2String(request.getParameter("secId"));
+ JSONArray data = new JSONArray();
+ String sql = "select top(6) * from docdetail where (maincategory = 0 or maincategory is null) and (subcategory = 0 or subcategory is null) and seccategory = ? and ishistory = 0 and docstatus = 1 order by doccreatedate desc";
+ RecordSet rs = new RecordSet();
+ rs.executeQuery(sql, secId);
+ log.info("abideBy sql ==>"+sql+" secId ==>"+secId);
+ while(rs.next()) {
+ JSONObject dataJson = new JSONObject();
+ dataJson.put("name", Util.null2String(rs.getString("docsubject")));
+ dataJson.put("link", "/spa/document/index.jsp?id=" + Util.null2String(rs.getString("id")));
+ dataJson.put("date", Util.null2String(rs.getString("doccreatedate")));
+ data.add(dataJson);
+ }
+
+ return data.toString();
+ }
+}
diff --git a/src/main/java/com/api/bokang/xiao/zhenn/controller/BankController.java b/src/main/java/com/api/bokang/xiao/zhenn/controller/BankController.java
index cbc3692..9a03898 100644
--- a/src/main/java/com/api/bokang/xiao/zhenn/controller/BankController.java
+++ b/src/main/java/com/api/bokang/xiao/zhenn/controller/BankController.java
@@ -96,7 +96,7 @@ public class BankController {
String encodedFileName = URLEncoder.encode(fileName, "UTF-8");
return Response.ok(streamingOutput, MediaType.APPLICATION_OCTET_STREAM)
// 指定编码方式为 UTF-8
- .header("Content-Disposition", "attachment; filename*=UTF-8''" + encodedFileName)
+ .header("Content-Disposition", "attachment;" + encodedFileName)
.build();
}catch (Exception e){
log.error("exportExcel error ==> "+Util.getErrString(e));
diff --git a/src/main/java/com/api/bokang/xiao/zhenn/mapper/BankMapper.java b/src/main/java/com/api/bokang/xiao/zhenn/mapper/BankMapper.java
index ef56c57..ab334d7 100644
--- a/src/main/java/com/api/bokang/xiao/zhenn/mapper/BankMapper.java
+++ b/src/main/java/com/api/bokang/xiao/zhenn/mapper/BankMapper.java
@@ -67,7 +67,7 @@ public interface BankMapper {
* @return 付款信息列表
*/
@Select("select id,txnamt amount,txnamt difAmount,txnamt outAmount,insid," +
- " insid outFlowNo,txndate_time,actacn,tobank inCompany from uf_bank_trade_info " +
+ " insid outFlowNo,txndate_time,actacn,concat(toname,'-',actacn_receipt) inCompany from uf_bank_trade_info " +
"where txndate_time BETWEEN #{beginDate} AND #{endDate} " +
" and trncur = #{currencySpan}" +
" and actacn = #{currentBankAccount}")
@@ -79,7 +79,7 @@ public interface BankMapper {
* @return 收款信息列表
*/
@Select("select id,id payInfo,txnamt amount,txnamt difAmount,txnamt inAmount,insid," +
- " insid inFlowNo,txndate_time,actacn,ibkname outCompany from uf_bank_trade_info " +
+ " insid inFlowNo,txndate_time,actacn,concat(acntname,'-',actacn) outCompany from uf_bank_trade_info " +
"where txndate_time BETWEEN #{beginDate} AND #{endDate} " +
" and trncur = #{currencySpan}" +
" and actacn_receipt = #{currentBankAccount}")
@@ -106,4 +106,31 @@ public interface BankMapper {
" and IvFisPeriod = MONTH(#{beginDate})")
double queryBankStatementBalance(Map param);
+ /**
+ * 查询流程付款信息
+ * @param param 查询参数
+ * @return 付款信息列表
+ */
+ @Select("SELECT t.requestid requestId,t.$t{amountField} amount,t.$t{amountField} outAmount," +
+ " $t{inCompany} inCompany,wb.lastoperatedate outDate,$t{bankFlowField} bankFlow " +
+ "FROM $t{tableName} t " +
+ "INNER JOIN workflow_requestbase wb ON t.requestid = wb.requestid " +
+ "WHERE wb.currentnodetype = 3 " +
+ " AND wb.lastoperatedate BETWEEN #{beginDate} AND #{endDate} " +
+ " AND $t{currencyField} = #{currency}")
+ List