Преглед изворни кода

修改bug:
bug表1007,平台应收 结算报表-对接人结算报表用结算时间筛选出来的结果不对

jiakai пре 1 месец
родитељ
комит
f94bb2a1a7
1 измењених фајлова са 2 додато и 3 уклоњено
  1. 2 3
      tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

+ 2 - 3
tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -1971,9 +1971,8 @@
             <if test="settlementReportQueryVo.receiver != null and settlementReportQueryVo.receiver != ''">
                 AND ipi.contact_person = #{settlementReportQueryVo.receiver}
             </if>
-            <if test="settlementReportQueryVo.startTime != null and settlementReportQueryVo.startTime != ''">
-                AND ipi.signing_time BETWEEN #{settlementReportQueryVo.startTime} AND #{settlementReportQueryVo.endTime}
-                AND (ipii.invoice_time BETWEEN #{settlementReportQueryVo.startTime} AND #{settlementReportQueryVo.endTime}
+            <if test="settlementReportQueryVo.startTime != null and settlementReportQueryVo.startTime != '' and settlementReportQueryVo.endTime != null and settlementReportQueryVo.endTime != ''">
+                AND ((ipii.invoice_time BETWEEN #{settlementReportQueryVo.startTime} AND #{settlementReportQueryVo.endTime})
                 OR ipii.invoice_time IS NULL)
             </if>
         </where>