Merge remote-tracking branch 'origin/main'

zhyc-module/src/main/resources/mapper/frozen/DdFeMapper.xml

@@ -69,6 +69,7 @@
             <if test="params.beginOutDate != null and params.endOutDate != null">
                 and out_date between #{params.beginOutDate} and #{params.endOutDate}
             </if>
+            <if test="status != null and status != ''">and status = #{status}</if>
         </where>
     </select>
 

zhyc-module/src/main/resources/mapper/frozen/DdFsMapper.xml

@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.beginOutDt != null and params.endOutDt != null">
                 and out_dt between #{params.beginOutDt} and #{params.endOutDt}
             </if>
+            <if test="stat != null and stat != ''">and stat = #{stat}</if>
         </where>
     </select>