dengyj преди 3 години
родител
ревизия
b9b410e52a

+ 2 - 0
src/main/java/com/steerinfo/baseinfo/meterbasespotinfo/mapper/MeterBaseSpotInfoMapper.xml

@@ -1218,6 +1218,7 @@
       </if>
     group by base_spot_no,
            base_spot_name
+    order by base_spot_name asc
   </select>
 
   <select id="staticSpotGroupByActualAndFirst" parameterType="java.util.HashMap" resultMap="BaseResultMap">
@@ -1313,6 +1314,7 @@
     </if>
     group by base_spot_no,
     base_spot_name
+    order by base_spot_name asc
   </select>
 
   <select id="spotGroupCarActual" parameterType="java.util.HashMap" resultMap="BaseResultMap">

+ 1 - 0
src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/mapper/MeterWorkCarMeterTimeMapper.xml

@@ -437,6 +437,7 @@
       </if>
     </where>
     group by t1.BASE_SPOT_NO,t1.BASE_SPOT_NAME
+    order by t1.BASE_SPOT_NAME asc
   </select>
 
   <resultMap id="PointDetailsResultMap" type="com.steerinfo.meterwork.meterworkcarmetertime.model.PointDetailsVo">

+ 1 - 0
src/main/java/com/steerinfo/meterwork/meterworkdatacount/mapper/MeterWorkDataCountMapper.xml

@@ -1125,6 +1125,7 @@
                 else A.value_flag end valueFlag
     from meter_work_railway_act_first A
         where A.value_flag != '0'
+        and A.railway_type_no = '001019002'
         <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
             and  A.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and A.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
         </if>