taijai

src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -418,13 +418,20 @@
         <if test="receivName != null">
             and RCON.CONSIGNEE_COMPANY_NAME like #{receivName}
         </if>
-        <if test="oneDate != null">
+        <if test="oneDate != null and orderTypee == 1">
             and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TER.RESULT_ENTRY_GATE_TIME
         </if>
-        <if test="startDate != null">
+        <if test="startDate != null and orderTypee == 1">
             and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TER.RESULT_ENTRY_GATE_TIME
             and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TER.RESULT_ENTRY_GATE_TIME
         </if>
+        <if test="oneDate != null and orderTypee != 1">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_GROSS_WEIGHT_TIME
+        </if>
+        <if test="startDate != null and orderTypee != 1">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_GROSS_WEIGHT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TWR.RESULT_GROSS_WEIGHT_TIME
+        </if>
         )
         <where>
             <if test="remark != null">