Merge remote-tracking branch 'origin/develop' into develop

isc-common-core/src/main/java/com/brilliance/isc/bo/Smh.java

@@ -144,5 +144,12 @@ public class Smh implements Serializable {
         //原ISO报文类型
         private String orimsgtyp = NULLSTR;
 
+        private  String mpiinr=NULLSTR;
+
+        private String docmd5 = NULLSTR;
+
+        private long doclen ;
+
+        private int xxxcnt ;
 
 }

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

@@ -170,4 +170,6 @@ public interface SmhMapper {
 
     Smh getSmhByApfcnt(@Param("apfcnt")String apfcnt);
 
+    Smh selectByMpiinr(@Param("mpiinr") String mpiinr);
+
 }
\ No newline at end of file

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

@@ -334,7 +334,8 @@
         <if test="cod != null and cod !=''"> and a.cod = #{cod,jdbcType=VARCHAR}</if>
     </select>
     <select id="selectFirstCodList" resultMap="AtpInfoVo">
-        select  distinct  s1.txt as mancodName,a.MANCOD -- ,GROUP_CONCAT(a.cod) as subcodstr
+        select distinct t.* from (
+        select s1.txt as mancodName,a.MANCOD
         from atp a
         left join stb s1 on s1.tbl='MANCOD' and s1.UIL='CN' and s1.cod=a.mancod
         where 1=1
@@ -342,9 +343,7 @@
         and a.mancod is not null
         and s1.cod is not null
         and s1.cod not like 'FCT%'
---         <if test="cod != null and cod !=''"> and a.mancod = #{cod,jdbcType=VARCHAR}</if>
---         group by a.mancod
-        order by s1.srt asc
+        order by s1.srt asc) t
     </select>
 
     <select id="selectSecondCodList" resultMap="AtpInfoVo">
@@ -354,7 +353,6 @@
         where 1=1
         and a.BUSTRNFLG ='X'
         and s1.cod is not null
---           <if test="cod != null and cod !=''"> and a.cod = #{cod,jdbcType=VARCHAR}</if>
         order by a.cod asc
     </select>
 

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

@@ -815,6 +815,12 @@
         apfcnt =#{apfcnt,jdbcType=VARCHAR}
         limit 1
     </select>
+    <select id="selectByMpiinr" resultType="com.brilliance.isc.mda.dao">
+        select
+        <include refid="Base_Column_List"/>
+        from smh
+        where mpiinr = #{mpiinr}
+    </select>
 </mapper>