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

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

@@ -390,10 +390,10 @@
                 and ITEMS_NAME like CONCAT('%', #{itemsName},'%')
             </if>
             <if test="XCXSSRQ !=null">
-                and XCXSSRQ=#{XCXSSRQ}
+                and XCXSSRQ like concat('%', #{XCXSSRQ},'%')
             </if>
             <if test="ZCCSSRQ !=null">
-                and ZCCSSRQ=#{ZCCSSRQ}
+                and ZCCSSRQ like concat('%',#{ZCCSSRQ},'%')
             </if>
         </where>
     </sql>

adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml

@@ -41,7 +41,11 @@
 			quality_evaluation.create_time AS createTime,
 			quality_evaluation.modify_time AS modifyTime,
 			`index`.value_type AS valueType,
-			`index`.three_index_title as indexTitle
+			`index`.three_index_title as indexTitle,
+			`index`.one_index_title as oneIndexTitle,
+			`index`.two_index_title as twoIndexTitle,
+			`index`.three_index_title as threeIndexTitle,
+			`index`.weight as weight
 		FROM
 			quality_evaluation
 		LEFT JOIN ts_user `user` ON quality_evaluation.user_id = `user` .USID