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

dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml

@@ -90,7 +90,7 @@
             and t.rzh_yesorno = #{rzzt}
         </if>
         <if test="rzzt != null and rzzt == '3'">
-            and (t.rzh_yesorno = '2' OR t.rzh_yesorno = '3')
+            and (t.rzh_yesorno = '2' OR t.rzh_yesorno = '1')
         </if>
         <if test="xfmc != null and xfmc != '' and xfmc != 'null' ">
             and t.xf_name like CONCAT(#{xfmc},'%')
@@ -205,9 +205,12 @@
         <if test="qszt != null and qszt != '' and qszt != 'null' ">
             and t.qs_status = #{qszt}
         </if>
-        <if test="rzzt != null and rzzt != '' and rzzt != 'null' ">
+        <if test="rzzt != null and rzzt != '' and rzzt != 'null'  and rzzt != '3'">
             and t.rzh_yesorno = #{rzzt}
         </if>
+        <if test="rzzt != null and rzzt == '3'">
+            and (t.rzh_yesorno = '2' OR t.rzh_yesorno = '1')
+        </if>
         <if test="xfmc != null and xfmc != '' and xfmc != 'null' ">
             and t.xf_name like CONCAT(#{xfmc},'%')
         </if>

dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml

@@ -1672,7 +1672,7 @@
             </foreach>
         </if>
         and invoice_status != '0'
-        and auth_status = '4'
+        and (rzh_yesorno = '1' or rzh_yesorno = '2')
         and invoice_type in ('01','03','08','14','31')
         and company = #{paramsData.company}
         and invoice_date between #{paramsData.kpksrq} and #{paramsData.kpjsrq}