提交

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/service/impl/MeterWorkCarnoIdentifyServiceImpl.java

@@ -172,7 +172,9 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
                     //枪机车号未识别数
                     countGunIdentifyTemp = models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                             && model.getBaseSpotName().equals(spot.getBaseSpotName())
-                            && StringUtils.isEmpty(model.getVideoCarNo2())).count()-countRfidIdentify;
+                            && (StringUtils.isEmpty(model.getVideoCarNo2())
+                            ||  (model.getCarNoType().equals("2")
+                            && StringUtils.isNotEmpty(model.getRfidCarNo())))).count()-countRfidIdentify;
                     countGunIdentifyTemp02 = models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                             && model.getBaseSpotName().equals(spot.getBaseSpotName())
                             && StringUtils.isEmpty(model.getVideoCarNo2())).count();

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

@@ -3945,6 +3945,18 @@
         and  RAILWAY_NO like '%${railwayNo}%'
       </if>
     </if>
+    <if test="lcNo != null">
+      and ( lc_no in
+      <foreach collection="lcNoTemp" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+      <if test="lcNoNull != null and lcNoNull != ''">
+        or lc_no is null )
+      </if>
+      <if test="lcNoNull == null or lcNoNull == ''">
+        and lc_no is not null)
+      </if>
+    </if>
     and value_flag != '0'
     order by net_time desc
   </select>
@@ -3990,7 +4002,6 @@
       and  lc_No like '%${lcNo}%'
     </if>
     and value_flag != '0'
-    --     and lc_no is not null
     order by net_time desc
   </select>
 
@@ -4512,6 +4523,24 @@
         select C.actual_first_no from meter_work_railway_act_first C where C.lc_no = #{tareLcNo}
         )
       </if>
+      <if test="lcNoTemp != null">
+        and ( lc_no in
+        <foreach collection="lcNoTemp" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+        <if test="lcNoNull != null and lcNoNull != ''">
+          or lc_no is null )
+        </if>
+        <if test="lcNoNull == null or lcNoNull == ''">
+          and lc_no is not null)
+        </if>
+      </if>
+      <if test="railwayNoTemp != null">
+        and railway_no in
+        <foreach collection="railwayNoTemp" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
     </where>
     and value_flag != '0'
     order by net_time desc

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

@@ -1521,18 +1521,21 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
 //        List<String> list = meterWorkRailwayActualMapper.distinctRailwayNo(param).stream().map(MeterWorkRailwayActual::getRailwayNo).collect(Collectors.toList());
 //        return list;
 
-//        String[] lcNoTemp = param.get("lcNo").toString().split(",");
-////        param.remove("lcNo");
-//        param.put("lcNoTemp", lcNoTemp);
-//        for (String str:
-//                lcNoTemp) {
-//            if(str.equals("")) {
-//                param.put("lcNoNull", "1");
-//                break;
-//            }else {
-//                param.put("lcNoNull", "");
-//            }
-//        }
+        if(param.get("lcNo") != null) {
+            String[] lcNoTemp = param.get("lcNo").toString().split(",");
+//        param.remove("lcNo");
+            param.put("lcNoTemp", lcNoTemp);
+            for (String str:
+                    lcNoTemp) {
+                if(str.equals("")) {
+                    param.put("lcNoNull", "1");
+                    break;
+                }else {
+                    param.put("lcNoNull", "");
+                }
+            }
+        }
+
         List<String> list = new ArrayList<>();
         try{
             list = meterWorkRailwayActualMapper.distinctRailwayNoTemp(param)
@@ -3299,18 +3302,34 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
 
     @Override
     public List<MeterWorkRailwayActual> webByLikeDesc(HashMap<String, Object> parameters) {
-//        String[] lcNoTemp = parameters.get("lcNoTemp").toString().split(",");
-//        parameters.remove("lcNoTemp");
-//        parameters.put("lcNoTemp", lcNoTemp);
-//        for (String str:
-//                lcNoTemp) {
-//            if(str.equals("")) {
-//                parameters.put("lcNoNull", "1");
-//                break;
-//            }else {
-//                parameters.put("lcNoNull", "");
+        if(parameters.get("lcNoTemp") != null) {
+            String[] lcNoTemp = parameters.get("lcNoTemp").toString().split(",");
+            parameters.remove("lcNoTemp");
+            parameters.put("lcNoTemp", lcNoTemp);
+            for (String str:
+                    lcNoTemp) {
+                if(str.equals("")) {
+                    parameters.put("lcNoNull", "1");
+                    break;
+                }else {
+                    parameters.put("lcNoNull", "");
+                }
+            }
+        }
+        if(parameters.get("railwayNoTemp") != null) {
+            String[] railwayNoTemp = parameters.get("railwayNoTemp").toString().split(",");
+            parameters.remove("railwayNoTemp");
+            parameters.put("railwayNoTemp", railwayNoTemp);
+//            for (String str:
+//                    railwayNoTemp) {
+//                if(str.equals("")) {
+//                    parameters.put("lcNoNull", "1");
+//                    break;
+//                }else {
+//                    parameters.put("lcNoNull", "");
+//                }
 //            }
-//        }
+        }
 
         List<MeterWorkRailwayActual> rows = meterWorkRailwayActualMapper.likeByDescTemp(parameters);
         return rows;

src/main/java/com/steerinfo/meterwork/meterworkrailwayactualbak/mapper/MeterWorkRailwayActualBakMapper.xml

@@ -3812,6 +3812,18 @@
     <if test="railwayNo != null and railwayNo != ''">
       and railway_no like '%${railwayNo}%'
     </if>
+    <if test="lcNo != null">
+      and ( lc_no in
+      <foreach collection="lcNoTemp" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+      <if test="lcNoNull != null and lcNoNull != ''">
+        or lc_no is null )
+      </if>
+      <if test="lcNoNull == null or lcNoNull == ''">
+        and lc_no is not null)
+      </if>
+    </if>
     and value_flag != '0'
     order by net_time desc
   </select>
@@ -4039,6 +4051,18 @@
       <if test="flag != null and flag !=''">
         and lc_no is null
       </if>
+      <if test="lcNoTemp != null">
+        and ( lc_no in
+        <foreach collection="lcNoTemp" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+        <if test="lcNoNull != null and lcNoNull != ''">
+          or lc_no is null )
+        </if>
+        <if test="lcNoNull == null or lcNoNull == ''">
+          and lc_no is not null)
+        </if>
+      </if>
       <if test="railwayNoArr != null">
           and railway_no in
           <foreach collection="railwayNoList" item="item" open="(" separator="," close=")">

src/main/java/com/steerinfo/meterwork/meterworkrailwayactualbak/service/impl/MeterWorkRailwayActualBakServiceImpl.java

@@ -1073,18 +1073,21 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
 //        List<String> list = meterWorkRailwayActualBakMapper.distinctRailwayNo(param).stream().map(MeterWorkRailwayActual::getRailwayNo).collect(Collectors.toList());
 //        return list;
 
-//        String[] lcNoTemp = param.get("lcNo").toString().split(",");
-////        param.remove("lcNo");
-//        param.put("lcNoTemp", lcNoTemp);
-//        for (String str:
-//                lcNoTemp) {
-//            if(str.equals("")) {
-//                param.put("lcNoNull", "1");
-//                break;
-//            }else {
-//                param.put("lcNoNull", "");
-//            }
-//        }
+        if(param.get("lcNo") != null) {
+            String[] lcNoTemp = param.get("lcNo").toString().split(",");
+//        param.remove("lcNo");
+            param.put("lcNoTemp", lcNoTemp);
+            for (String str:
+                    lcNoTemp) {
+                if(str.equals("")) {
+                    param.put("lcNoNull", "1");
+                    break;
+                }else {
+                    param.put("lcNoNull", "");
+                }
+            }
+        }
+
         List<String> list = new ArrayList<>();
         try{
             list = meterWorkRailwayActualBakMapper.distinctRailwayNoTemp(param)