Merge remote-tracking branch 'origin/develop_3' into develop_1

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandAttrInfo/SarStandAttrInfoMapper.xml

@@ -197,6 +197,17 @@
         WHERE valid_flag=0 and stand_id = #{standId, jdbcType=VARCHAR}
     </select>
 
+    <!--    查询字段及对应数据 List<Map>-->
+    <select id="selectStandFieldAndDataListMap" resultType="Map">
+        SELECT ${fieldInfo},ID
+        FROM SAR_STAND_ATTR_INFO
+        WHERE valid_flag=0
+        and stand_id in
+        <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+            #{item, jdbcType=VARCHAR}
+        </foreach>
+    </select>
+
     <insert id="insertStandAttr" parameterType="java.lang.String" >
         insert into SAR_STAND_ATTR_INFO(${fieldInfo})
         values (${fieldValue})

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml

@@ -395,7 +395,7 @@
             <if test="country != null and country != ''">
                 and country = #{country}
             </if>
-            <!-- 标准编号 -->
+            <!-- 标准编号111 -->
             <if test="standNumber != null and standNumber != ''">
                 and (
                 (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',