|
@@ -1026,6 +1026,9 @@
|
|
|
and A.net_time >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
|
|
and A.net_time >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
|
|
|
and A.net_time <= TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
|
|
and A.net_time <= TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="railwayTypeNo != null and railwayTypeNo != ''">
|
|
|
|
|
+ and A.railway_type_no = #{railwayTypeNo}
|
|
|
|
|
+ </if>
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<select id="railwayActualGrossWeightComparisonDetail" parameterType="java.util.HashMap"
|
|
<select id="railwayActualGrossWeightComparisonDetail" parameterType="java.util.HashMap"
|
|
@@ -1041,6 +1044,9 @@
|
|
|
and A.net_time >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
|
|
and A.net_time >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
|
|
|
and A.net_time <= TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
|
|
and A.net_time <= TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="railwayTypeNo != null and railwayTypeNo != ''">
|
|
|
|
|
+ and A.railway_type_no = #{railwayTypeNo}
|
|
|
|
|
+ </if>
|
|
|
group by A.conveyance_Type,
|
|
group by A.conveyance_Type,
|
|
|
A.matter_No,
|
|
A.matter_No,
|
|
|
A.matter_Name
|
|
A.matter_Name
|