From 58495646ab7e33998c4046d36ed52a9a7d884129 Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Thu, 27 Mar 2025 15:28:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fin/api/finpayment/FinPaymentFeign.java   |  6 ++++++
 .../finpaymentapply/FinPaymentapplyFeign.java | 14 -------------
 .../FinPaymentapplyDetailsBelowEve.java       |  2 --
 ...nPaymentapplyDetailsBelowEveDetailsVo.java |  2 --
 .../FinPaymentapplyDetailsBelowEveDto.java    |  2 --
 .../fin/biz/finpayment/FinPaymentRest.java    | 12 +++++++++++
 .../fin/biz/finpayment/FinPaymentService.java |  4 ++--
 .../FinPaymentapplyDetailsBelowMapper.java    | 21 +++----------------
 .../FinPaymentapplyDetailsBelowMapper.xml     | 14 +++++++++++++
 .../FinPaymentapplyDetailsBelowService.java   |  5 +++++
 10 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentFeign.java
index 74fe94cfcd..51636255f6 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentFeign.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentFeign.java
@@ -34,6 +34,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 @Api(tags = "付款信息管理")
 @FeignClient(
@@ -71,4 +72,9 @@ public interface FinPaymentFeign {
     @PostMapping("/updateOpenDate")
     @ResponseBody
     public ResultBean updateOpenDate(@RequestParam("sid") String sid, @RequestParam("openDate") String openDate);
+
+    @ApiOperation("选择平仓款名称")
+    @PostMapping("/selClosFundName")
+    @ResponseBody
+    public ResultBean<List<Map<String,String>>> selClosFundName(@RequestParam("useOrgSid") String useOrgSid);
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java
index 8bd8bfad50..77b3a0d25f 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java
@@ -34,23 +34,9 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
-
 import javax.validation.Valid;
 import java.util.List;
 
-/**
- * Project: anrui-fin(财务) <br/>
- * File: FinPaymentapplyFeign.java <br/>
- * Class: com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyFeign <br/>
- * Description: fin_paymentapply. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-06-23 13:45:10 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "付款申请")
 @FeignClient(
         contextId = "anrui-fin-FinPaymentapply",
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java
index 6228b8d12d..f3193ebacb 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java
@@ -47,8 +47,6 @@ public class FinPaymentapplyDetailsBelowEve extends BaseEntity {
     private String costTypeValue;
     @ApiModelProperty("付款申请明细的明细sid")
     private String detailSid; // 付款申请明细的明细sid
-    @ApiModelProperty("融资付款开通日期")
-    private String openDate; // 融资付款开通日期
     @ApiModelProperty("期数")
     private String period; // 期数
     @ApiModelProperty("付款单位sid")
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDetailsVo.java
index c23e5beabf..cacd87b669 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDetailsVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDetailsVo.java
@@ -63,8 +63,6 @@ public class FinPaymentapplyDetailsBelowEveDetailsVo implements Vo {
     private String costTypeValue;
     @ApiModelProperty("付款申请明细的明细sid")
     private String detailSid; // 付款申请明细的明细sid
-    @ApiModelProperty("融资付款开通日期")
-    private String openDate; // 融资付款开通日期
     @ApiModelProperty("期数")
     private String period; // 期数
     @ApiModelProperty("付款单位sid")
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java
index e030f2c37f..9b2fc3da74 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java
@@ -65,8 +65,6 @@ public class FinPaymentapplyDetailsBelowEveDto implements Dto {
     private String costTypeValue;
     @ApiModelProperty("付款申请明细的明细sid")
     private String detailSid; // 付款申请明细的明细sid
-    @ApiModelProperty("融资付款开通日期")
-    private String openDate; // 融资付款开通日期
     @ApiModelProperty("期数")
     private String period; // 期数
     @ApiModelProperty("付款单位sid")
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java
index bf50978df7..d15892605d 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java
@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.finpayment;
 
+import com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -34,6 +35,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import java.util.List;
+import java.util.Map;
+
 import com.yxt.anrui.fin.api.finpayment.FinPaymentQuery;
 import com.yxt.anrui.fin.api.finpayment.FinPaymentVo;
 import com.yxt.anrui.fin.api.finpayment.FinPaymentDetailsVo;
@@ -49,6 +52,8 @@ public class FinPaymentRest implements FinPaymentFeign {
     private FinPaymentService finPaymentService;
     @Autowired
     private FinPaymentapplyDetailsBelowEveService finPaymentapplyDetailsBelowEveService;
+    @Autowired
+    private FinPaymentapplyDetailsBelowService finPaymentapplyDetailsBelowService;
 
     @Override
     @ApiOperation("根据条件分页查询数据的列表")
@@ -97,4 +102,11 @@ public class FinPaymentRest implements FinPaymentFeign {
         finPaymentapplyDetailsBelowEveService.updateOpenDate(sid,openDate);
         return rb.success();
     }
+
+    @Override
+    public ResultBean<List<Map<String, String>>> selClosFundName(String useOrgSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<Map<String, String>> maps = finPaymentapplyDetailsBelowService.selClosFundName(useOrgSid);
+        return rb.success().setData(maps);
+    }
 }
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java
index 63332265d5..87f34b37ae 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java
@@ -116,8 +116,8 @@ public class FinPaymentService extends MybatisBaseService<FinPaymentMapper, FinP
         if (StringUtils.isNotBlank(query.getReceivingAccount())) {
             qw.like("receivingAccount", query.getReceivingAccount());
         }
-        if (StringUtils.isNotBlank(query.getBusinessTypeValue())) {
-            qw.like("businessTypeValue", query.getBusinessTypeValue());
+        if (StringUtils.isNotBlank(query.getBank())) {
+            qw.like("bank", query.getBank());
         }
         IPage<FinPayment> page = PagerUtil.queryToPage(pq);
         IPage<FinPaymentVo> pagging = baseMapper.selectPageVo(page, qw);
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java
index 6e318171d8..016ed85fa1 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java
@@ -25,34 +25,19 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelow;
-
 import java.util.List;
+import java.util.Map;
 
-/**
- * Project: anrui-fin(付款明细) <br/>
- * File: FinPaymentapplyDetailsBelowMapper.java <br/>
- * Class: com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowMapper <br/>
- * Description: 付款申请明细-明细. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-12-12 16:08:28 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface FinPaymentapplyDetailsBelowMapper extends BaseMapper<FinPaymentapplyDetailsBelow> {
 
     @Select("select * from fin_paymentapply_details_below where detailSid = #{mainSid}")
     List<FinPaymentapplyDetailsBelowDetailsVo> selByMainSid(String mainSid);
+
+    List<Map<String, String>> selClosFundName(String useOrgSid);
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.xml
index 58a332166b..0714e64c14 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.xml
@@ -3,4 +3,18 @@
 <mapper namespace="com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowMapper">
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
+
+    <select id="selClosFundName" resultType="java.util.Map">
+        SELECT
+            db.sid AS detailSid,
+            db.closFundName
+        FROM
+            fin_paymentapply_details_below  db
+                LEFT JOIN fin_paymentapply_details d
+                          ON db.detailSid = d.sid
+                LEFT JOIN fin_paymentapply a
+                          ON d.applySid = a.sid
+        WHERE db.costTitleKey = '015'
+          AND a.useOrgSid = #{useOrgSid}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java
index 86da3c6d37..e8d60d1168 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java
@@ -40,6 +40,7 @@ import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsB
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-fin(付款明细) <br/>
@@ -67,4 +68,8 @@ public class FinPaymentapplyDetailsBelowService extends MybatisBaseService<FinPa
     public List<FinPaymentapplyDetailsBelowDetailsVo> selByMainSid(String mainSid) {
         return baseMapper.selByMainSid(mainSid);
     }
+
+    public List<Map<String, String>> selClosFundName(String useOrgSid) {
+        return baseMapper.selClosFundName(useOrgSid);
+    }
 }
\ No newline at end of file