作废的发票不参与统计

src/main/java/cn/hnthyy/thmz/mapper/his/ChargeFeeVoMapper.java

@@ -393,7 +393,7 @@ public interface ChargeFeeVoMapper {
                     "sum ( case when cheque_type ='E' and pay_mark ='1' then amount else 0 end ) wxtf," +
                     "sum ( case when cheque_type ='F' and pay_mark ='1' then amount else 0 end ) zfbtf " +
                     " from mz_deposit_file " +
-                    " where 1=1 ",
+                    " where 1=1 and pay_mark <![CDATA[<>]]> 2 ",
             "<when test='userIdCode!=null'>",
             " and op_id=#{userIdCode} ",
             "</when>",
@@ -448,7 +448,7 @@ public interface ChargeFeeVoMapper {
                     "isnull ( sum ( total_charge ) , 0 ) total_charge," +
                     "isnull (sum ( case mz_receipt_serial.pay_mark when '0' then 1 when '2' then 1 else 0 end ) ,0)total_count " +
                     "FROM mz_receipt_serial " +
-                    " where 1=1 " +
+                    " where 1=1 and pay_mark <![CDATA[<>]]> 2 " +
                     "<when test='userIdCode!=null'>",
             " and operator_id=#{userIdCode} ",
             "</when>",
@@ -729,8 +729,8 @@ public interface ChargeFeeVoMapper {
             "       total_amount=sum(case when pay_mark in ('0','1') then amount else 0 end) " +
             " from " +
             " ${tableName} " +
-            " where dcount_date>='2019-10-1 0:0:0.000' and " +
-            "      dcount_date<='2019-10-25 23:59:59.000' " +
+            " where dcount_date>=#{beginDate} and " +
+            "      dcount_date<=#{endDate} " +
             "group by op_id,dcount_date " +
             "order by op_id ")
     List<WorkloadVo>  selectSfWorkloadVo(@Param("tableName") String tableName,@Param("beginDate") Date beginDate, @Param("endDate") Date endDate);