提交

src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrument/mapper/MeterWorkMeasuringInstrumentMapper.xml

@@ -2780,6 +2780,9 @@
     <if test="createManName != null and createManName != ''">
       and CREATE_MAN_NAME LIKE '%${createManName}%'
     </if>
+    <if test="conveyanceType != null and conveyanceType != ''">
+      and CONVEYANCE_TYPE = #{conveyanceType}
+    </if>
     <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
       and  NET_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and NET_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
     </if>

src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrument/service/impl/MeterWorkMeasuringInstrumentServiceImpl.java

@@ -113,12 +113,12 @@ public class MeterWorkMeasuringInstrumentServiceImpl extends BaseServiceImpl<Met
                 rm.setMessage("车号不能为空");
                 return rm;
             }else {
-                Pattern pattern2 = Pattern.compile("[0-9]*");
-                Matcher matcher2 = pattern2.matcher(model.getRailwayNo());
-                if (!matcher2.matches()) {
-                    rm.setMessage("火车号包含字母或者其他特殊字符");
-                    return rm;
-                }
+//                Pattern pattern2 = Pattern.compile("[0-9]*");
+//                Matcher matcher2 = pattern2.matcher(model.getRailwayNo());
+//                if (!matcher2.matches()) {
+//                    rm.setMessage("火车号包含字母或者其他特殊字符");
+//                    return rm;
+//                }
             }
             if (StringUtils.isEmpty(model.getMatterName())){
                 rm.setMessage("物资名称不能为空");

src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrumentsecond/mapper/MeterWorkMeasuringInstrumentSecondMapper.xml

@@ -2780,6 +2780,9 @@
     <if test="createManName != null and createManName != ''">
       and CREATE_MAN_NAME LIKE '%${createManName}%'
     </if>
+    <if test="conveyanceType != null and conveyanceType != ''">
+      and CONVEYANCE_TYPE =  #{conveyanceType}
+    </if>
     <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
       and  NET_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and NET_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
     </if>

src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrumentsecond/service/impl/MeterWorkMeasuringInstrumentSecondServiceImpl.java

@@ -113,12 +113,12 @@ public class MeterWorkMeasuringInstrumentSecondServiceImpl extends BaseServiceIm
                 rm.setMessage("车号不能为空");
                 return rm;
             }else {
-                Pattern pattern2 = Pattern.compile("[0-9]*");
-                Matcher matcher2 = pattern2.matcher(model.getRailwayNo());
-                if (!matcher2.matches()) {
-                    rm.setMessage("火车号包含字母或者其他特殊字符");
-                    return rm;
-                }
+//                Pattern pattern2 = Pattern.compile("[0-9]*");
+//                Matcher matcher2 = pattern2.matcher(model.getRailwayNo());
+//                if (!matcher2.matches()) {
+//                    rm.setMessage("火车号包含字母或者其他特殊字符");
+//                    return rm;
+//                }
             }
             if (StringUtils.isEmpty(model.getMatterName())){
                 rm.setMessage("物资名称不能为空");

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/mapper/MeterWorkRailwayActualMapper.xml

@@ -4651,6 +4651,15 @@
     <if test="railwayTypeNo != null and railwayTypeNo != ''">
       and RAILWAY_TYPE_NO LIKE '%${railwayTypeNo}%'
     </if>
+    <if test="railwayTypeNo != null and railwayTypeNo != ''">
+      and RAILWAY_TYPE_NO LIKE '%${railwayTypeNo}%'
+    </if>
+    <if test="railwayTypeNoStr != null and railwayTypeNoStr != ''">
+      and RAILWAY_TYPE_NO in
+      <foreach collection="typeNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
     )
     union all
     (select A.railway_no,
@@ -4677,7 +4686,12 @@
     A.actual_first1_no,
     A.actual_first2_no
     from meter_work_measuring_instrument_second A
-    where A.value_flag != '0'))
+    where A.value_flag != '0'
+    <if test="railwayTypeNoStr != null and railwayTypeNoStr != ''">
+      and 1 != 1
+    </if>
+    )
+    )
     where 1 = 1
     <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
       and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/impl/MeterWorkRailwayActualServiceImpl.java

@@ -3148,6 +3148,10 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 parameters.remove("baseSpotNoList");
             }
         }
+        if(parameters.get("railwayTypeNoStr") != null) {
+            String[] typeNoStr = parameters.get("railwayTypeNoStr").toString().split(",");
+            parameters.put("typeNoStr", typeNoStr);
+        }
         List<MeterBaseUserPrintConfig> configs = meterBaseUserPrintConfigMapper.likeByDesc(map);
         List<MeterWorkRailwayActual> rowsTemp = meterWorkRailwayActualMapper.railwayPrintLikeByDesc(parameters);
         List<MeterWorkRailwayActual> rows = new ArrayList<>();