Merge branch 'developer' into wofkflow0620

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/FinancingInfoMapper.xml

@@ -35,12 +35,15 @@
             <if test="params.type == 3 ">
                 and info.status in ('待整改','整改未完成')
             </if>
-            <if test="params.status != null and params.status != ''">
-                and info.status = #{params.status}
-            </if>
+
         </where>
         ORDER BY
         info.rec_date DESC ,hph.sequence_nbr ASC ) as sta
+        <where>
+            <if test="params.status != null and params.status != ''">
+                and sta.status = #{params.status}
+            </if>
+        </where>
     </select>
     <select id="selectDataInfo" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.FinancingInfoDto">
         SELECT