多实体适配

isc-common-core/src/main/java/com/brilliance/isc/mda/dao/FecMapper.java

@@ -41,6 +41,8 @@ public interface FecMapper {
     List<Fec> selectFecByObjtypAndObjinrAndFeeinrAndFeepri(@Param("objtyp") String objtyp, @Param("objinr") String objinr, @Param("feeinr") String feeinr, @Param("feepri") String feepri);
 
     List<Fec> selectFecByConditionSql(@Param(value = "conditionSql") String conditionSql);
+    List<Fec> selectFecByConditionSqlAndParams(Map<String,Object> sqlAndParams);
+
 
     FecVo queryById(@Param("inr")String inr);
     FecVo queryById1(@Param("inr")String inr);

isc-common-core/src/main/resources/mapper/fecmapper.xml

@@ -641,6 +641,13 @@
         ${conditionSql}
     </select>
 
+    <select id="selectFecByConditionSqlAndParams" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from fec
+        ${conditionSql}
+    </select>
+
     <select id="queryById" resultType="com.brilliance.isc.vo.manager.FecVo">
         select B.INR inr, B.FEEINR feeinr, B.FEEPRI feepri, B.OBJTYP objtyp, B.OBJINR objinr, date_format(B.BEGDAT,'%Y-%m-%d') begdat, date_format(B.ENDDAT,'%Y-%m-%d')
         enddat, B.CALCBS calcbs, B.CALFCC calfcc, B.LOWAMT lowamt, B.HIGAMT higamt, B.MAXCUR maxcur, B.MAXAMT maxamt,

isc-common-core/src/main/resources/mapper/feemapper.xml

@@ -38,13 +38,12 @@
         where inr = #{inr,jdbcType=VARCHAR}
     </select>
 
-    <!-- TODO 多实体改造 -->
     <select id="selectByCod" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
         from fee
         where cod = #{cod,jdbcType=VARCHAR}
-
+          and etgextkey = #{_etgextkey}
     </select>
 
     <delete id="deleteByPrimaryKey">

isc-common-core/src/main/resources/mapper/sptmapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.brilliance.isc.mda.dao.SptMapper">
+                   com.brilliance.isc.mda.dao.SptMapper
 
     <resultMap id="BaseResultMap" type="com.brilliance.isc.bo.Spt">
         <result property="inr" column="inr" jdbcType="VARCHAR"/>

isc-common-service/src/main/java/com/brilliance/isc/common/util/Utils.java

@@ -425,7 +425,7 @@ public class Utils {
             // In both cases the rest of the command has to be put into brakets.
             if (argWhrFlg) {
                 String upsql = argSql.toUpperCase();
-                sql = "WHERE " + argCon + " and ( " + argSql.substring(upsql.lastIndexOf("WHERE")+5) + " )";
+                sql = "WHERE " + argCon + " and ( " + argSql.substring(upsql.indexOf("WHERE")+5) + " )";
             } else {
                 if (MdaUtils.isEmpty(argSql)) {
                     sql = "WHERE " + argCon;