actMapper新增查询方法，新增cbsconf.ini类FXD配置

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

@@ -78,4 +78,6 @@ public interface ActMapper {
     List<Act> selectCashAccList(@Param("holptyinr") String holptyinr, @Param("cur") String cur);
 
     List<Act> selectByExtkeyAndActpro(@Param("extkey") String extkey);
+
+    List<String> getSerAccByConditionSql(@Param(value = "conditionSql") String conditionSql);
 }
\ No newline at end of file

isc-common-core/src/main/resources/ini/cbsconf.ini

@@ -32,6 +32,7 @@ COD30=BDD
 COD31=BFD
 COD31=NID
 COD31=NCD
+COD33=FXD
 [CBCCOD]
 COD1=ACRACR
 COD2=AOPSUM
@@ -1244,4 +1245,46 @@ OPN=-
 UTLSUM=+
 [NID-UTLAMT-COL]
 COD1=OPN
-COD2=UTLSUM
+COD2=UTLSUM
\ No newline at end of file
+[FXD-CCVIN]
+OPR1=+CCVSUM
+[FXD-CCVIN-OPR]
+CCVSUM=+
+[FXD-CCVIN-COL]
+COD1=CCVSUM
+[FXD-CCVOUT]
+OPR1=-CCVSUM
+[FXD-CCVOUT-OPR]
+CCVSUM=-
+[FXD-CCVOUT-COL]
+COD1=CCVSUM
+[FXD-MAXAMT]
+OPR1=+MAXSUM
+OPR2=+OPN
+[FXD-MAXAMT-OPR]
+MAXSUM=+
+OPN=+
+[FXD-MAXAMT-COL]
+COD1=MAXSUM
+COD2=OPN
+[FXD-NOMAMT]
+OPR1=+NOMSUM
+[FXD-NOMAMT-OPR]
+NOMSUM=+
+[FXD-NOMAMT-COL]
+COD1=NOMSUM
+[FXD-OPNAMT]
+OPR1=+OPN2
+[FXD-OPNAMT-OPR]
+OPN2=+
+[FXD-OPNAMT-COL]
+COD1=OPN2
+[FXD-UTLAMT]
+OPR1=-OPN
+OPR2=+UTLSUM
+[FXD-UTLAMT-OPR]
+OPN=-
+UTLSUM=+
+[FXD-UTLAMT-COL]
+COD1=OPN
+COD2=UTLSUM

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

@@ -300,6 +300,13 @@
         ${conditionSql}
     </select>
 
+    <select id="getSerAccByConditionSql" resultMap="BaseResultMap">
+        select
+        seracc
+        from act
+        ${conditionSql}
+    </select>
+
     <select id="selectPtyinrListByExtkey" resultType="java.lang.String"> <!--环境用的是oracle数据库，实际再调整-->
         select distinct holptyinr from ACT WHERE EXTKEY=#{extkey,jdbcType=VARCHAR}
     </select>

isc-common-service/src/main/java/com/brilliance/isc/common/component/DyncDaoService.java

@@ -82,7 +82,11 @@ public class DyncDaoService {
         Map<String, Object> params = ImmutableBiMap.of("sql", sql);
         Map<String, Object> result = publicMapper.dyncQueryMap(params);
         if (result != null && result.size() > 0) {
-            return (T) result.get(field);
+            if (result.get(field)!=null ){
+                return (T) result.get(field);
+            }else{
+                return (T) result.get(field.toUpperCase());
+            }
         }
         return null;
     }