资金拆借/头寸调拨入口交易

isc-common-core/src/main/resources/mapper/FtdselMapper.xml → isc-common-core/src/main/resources/mapper/ftdselMapper.xml

@@ -22,8 +22,8 @@
         <result property="bnktyp" column="bnktyp" jdbcType="VARCHAR"/>
         <result property="etyextkey" column="etyextkey" jdbcType="VARCHAR"/>
         <result property="gzno" column="gzno" jdbcType="VARCHAR"/>
-<!--        <result property="cur" column="cur" jdbcType="VARCHAR"/>-->
-<!--        <result property="amt" column="amt" jdbcType="DECIMAL"/>-->
+        <result property="cur" column="cur" jdbcType="VARCHAR"/>
+        <result property="amt" column="amt" jdbcType="DECIMAL"/>
 
 
     </resultMap>
@@ -33,38 +33,6 @@
             usr,bnktyp,etyextkey,gzno
 
     </sql>
-    <!--在gzno后加,cbb.cur,cbb.amt-->
-    <select id="query" resultMap="BaseResultMap">
-        select <include refid="Base_Column_List" />
-        from ftd
-        where
-        <if test=" opndatfrom != null ">
-            ftd.OPNDAT>=#{opndatfrom,jdbcType=DATE}
-        </if>
-
-        <if test=" opndatto != null ">
-            AND ftd.OPNDAT&lt;=#{opndatto,jdbcType=DATE}
-        </if>
-        <if test=" seaownref != null and  seaownref != ''">
-            AND ftd.OWNREF=#{ seaownref,jdbcType=VARCHAR}
-        </if>
-
-        <if test=" nam != null and  nam != ''">
-            AND ftd.NAM=#{ nam,jdbcType=VARCHAR}
-        </if>
-        <if test=" ownusr != null and  ownusr != ''">
-            AND ftd.ownusr=#{ ownusr,jdbcType=VARCHAR}
-        </if>
-        <if test=" usr != null and  usr != ''">
-            AND ftd.usr=#{ usr,jdbcType=VARCHAR}
-        </if>
-        <if test=" fttyp != null and  fttyp != ''">
-            AND ftd.FTTYP=#{ fttyp,jdbcType=VARCHAR}
-        </if>
-        <if test=" gzno != null and  gzno != ''">
-            AND ftd.gzno=#{ gzno,jdbcType=VARCHAR}
-        </if>
-    </select>
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap">
         select
@@ -73,14 +41,56 @@
         where inr = #{inr,jdbcType=VARCHAR}
     </select>
 
-    <!--资金调拨_连接cbb表查询-->
-<!--    <select id="query" resultMap="BaseResultMap" parameterType="java.util.Map">-->
+<!--    资金调拨_连接cbb表查询-->
+    <select id="query" resultMap="BaseResultMap" parameterType="java.util.Map">
+    select <include refid="Base_Column_List" />
+    from ftd
+    join cbb on cbb.objinr = ftd.inr
+    where
+    <if test=" opndatfrom != null ">
+        ftd.OPNDAT>=#{opndatfrom,jdbcType=DATE}
+    </if>
+
+    <if test=" opndatto != null ">
+        AND ftd.OPNDAT&lt;=#{opndatto,jdbcType=DATE}
+    </if>
+    <if test=" seaownref != null and  seaownref != ''">
+        AND ftd.OWNREF=#{ seaownref,jdbcType=VARCHAR}
+    </if>
+
+    <if test=" nam != null and  nam != ''">
+        AND ftd.NAM=#{ nam,jdbcType=VARCHAR}
+    </if>
+    <if test=" ownusr != null and  ownusr != ''">
+        AND ftd.ownusr=#{ ownusr,jdbcType=VARCHAR}
+    </if>
+    <if test=" usr != null and  usr != ''">
+        AND ftd.usr=#{ usr,jdbcType=VARCHAR}
+    </if>
+    <if test=" fttyp != null and  fttyp != ''">
+        AND ftd.FTTYP=#{ fttyp,jdbcType=VARCHAR}
+    </if>
+    <if test=" gzno != null and  gzno != ''">
+        AND ftd.gzno=#{ gzno,jdbcType=VARCHAR}
+    </if>
+    <if test="cur != null and cur != ''">
+        AND cbb.cur = #{cur,jdbcType=VARCHAR}
+    </if>
+
+    <if test=" amtmin != null and amtmin != ''">
+        AND cbb.amt &gt;=#{amtmin,jdbcType=DECIMAL}
+    </if>
+    <if test=" amtmax != null and amtmax != ''">
+        AND cbb.amt &lt;=#{amtmax,jdbcType=DECIMAL}
+    </if>
+    </select>
+    <!--本地测试-->
+<!--    <select id="query" resultMap="BaseResultMap">-->
 <!--        select <include refid="Base_Column_List" />-->
 <!--        from ftd-->
-<!--        join cbb on cbb.objinr = ftd.inr-->
 <!--        where-->
 <!--        <if test=" opndatfrom != null ">-->
-<!--             ftd.OPNDAT>=#{opndatfrom,jdbcType=DATE}-->
+<!--            ftd.OPNDAT>=#{opndatfrom,jdbcType=DATE}-->
 <!--        </if>-->
 
 <!--        <if test=" opndatto != null ">-->
@@ -105,16 +115,9 @@
 <!--        <if test=" gzno != null and  gzno != ''">-->
 <!--            AND ftd.gzno=#{ gzno,jdbcType=VARCHAR}-->
 <!--        </if>-->
-<!--        <if test="cur != null and cur != ''">-->
-<!--            AND cbb.cur = #{cur,jdbcType=VARCHAR}-->
-<!--        </if>-->
+<!--    </select>-->
+
 
-<!--        <if test=" amtmin != null and amtmin != ''">-->
-<!--            AND cbb.amt &gt;=#{amtmin,jdbcType=DECIMAL}-->
-<!--        </if>-->
-<!--        <if test=" amtmax != null and amtmax != ''">-->
-<!--            AND cbb.amt &lt;=#{amtmax,jdbcType=DECIMAL}-->
-<!--        </if>-->