Merge remote-tracking branch 'origin/master'

collect-fees/fees-px-api/src/main/resources/mapper/sfgl/YyQfmxMapper.xml

@@ -150,13 +150,13 @@
         <if test="filter.ffgxzh!=null">
             AND a.yhbh in (select yhbh from yh_group_accounts
             where group_id in (select id from yh_group where yhbh= #{filter.ffgxzh}))
-            <if test="filter.cwrq==null and filter.cwrqStart==null and filter.cwrqEnd==null">
-                and cwrq=(select min(cwrq) from yy_qfmx where
-                sfbz='0' AND chbz='0' and yhbh in (
-                select yhbh from yh_group_accounts
-                where group_id in (select id from yh_group where yhbh= #{filter.ffgxzh})
-                ))
-            </if>
+<!--            <if test="filter.cwrq==null and filter.cwrqStart==null and filter.cwrqEnd==null">-->
+<!--                and cwrq=(select min(cwrq) from yy_qfmx where-->
+<!--                sfbz='0' AND chbz='0' and yhbh in (-->
+<!--                select yhbh from yh_group_accounts-->
+<!--                where group_id in (select id from yh_group where yhbh= #{filter.ffgxzh})-->
+<!--                ))-->
+<!--            </if>-->
         </if>
         <if test="filter.sfsykfp!=null">
             AND a.ei_ykfp_bz=#{filter.sfsykfp}
@@ -253,13 +253,13 @@
         <if test="filter.ffgxzh!=null">
             AND a.yhbh in (select yhbh from yh_group_accounts
             where group_id in (select id from yh_group where yhbh= #{filter.ffgxzh}))
-            <if test="filter.cwrq==null and filter.cwrqStart==null and filter.cwrqEnd==null">
-                and cwrq=(select min(cwrq) from yy_qfmx where
-                sfbz='0' AND chbz='0' and yhbh in (
-                select yhbh from yh_group_accounts
-                where group_id in (select id from yh_group where yhbh= #{filter.ffgxzh})
-                ))
-            </if>
+<!--            <if test="filter.cwrq==null and filter.cwrqStart==null and filter.cwrqEnd==null">-->
+<!--                and cwrq=(select min(cwrq) from yy_qfmx where-->
+<!--                sfbz='0' AND chbz='0' and yhbh in (-->
+<!--                select yhbh from yh_group_accounts-->
+<!--                where group_id in (select id from yh_group where yhbh= #{filter.ffgxzh})-->
+<!--                ))-->
+<!--            </if>-->
         </if>
         <if test="filter.sfsykfp!=null">
             AND a.ei_ykfp_bz=#{filter.sfsykfp}