dengyj 3 lat temu
rodzic
commit
acb8b5b5c8

+ 6 - 0
src/main/java/com/steerinfo/meterwork/meterworkrailwayactualbak/mapper/MeterWorkRailwayActualBakMapper.xml

@@ -4039,6 +4039,12 @@
       <if test="flag != null and flag !=''">
         and lc_no is null
       </if>
+      <if test="railwayNoArr != null">
+          and railway_no in
+          <foreach collection="railwayNoList" item="item" open="(" separator="," close=")">
+            #{item}
+          </foreach>
+      </if>
       <if test="grossLcNo != null">
         and actual_first1_no in (
         select B.actual_first_no from meter_work_railway_act_first B where B.lc_no = #{grossLcNo}

+ 8 - 2
src/main/java/com/steerinfo/meterwork/meterworkrailwayactualbak/service/impl/MeterWorkRailwayActualBakServiceImpl.java

@@ -2568,6 +2568,10 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
                 }
             }
         }
+        if(parameters.get("railwayNoArr") != null) {
+            String[] railwayNoList = parameters.get("railwayNoArr").toString().split(",");
+            parameters.put("railwayNoList", railwayNoList);
+        }
         List<MeterWorkRailwayActualBak> rows = meterWorkRailwayActualBakMapper.likeByDescTemp(parameters);
         return rows;
     }
@@ -2621,6 +2625,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         rm.setFailed();
         try {
             int count = 0;
+            int lcCount = 0;
             if(models.size() >= 1) {
                 List<MeterWorkRailwayActFirstBak> grossList = new ArrayList<>();
                 List<MeterWorkRailwayActFirstBak> tareList = new ArrayList<>();
@@ -2638,6 +2643,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
                         }
                         grossList.add(grossModel);
                         tareList.add(tareModel);
+                        lcCount += 2;
                     }
                 }
 
@@ -2649,7 +2655,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
                         model.setLcNo(model.getBaseSpotName().replaceAll("#", "")
                                 .replaceAll("轨道衡", "")
                                 .replaceAll("静轨", "")
-                                .replaceAll("静态", "") + "-" + afl + lcNo + "(" + models.size() + ")");
+                                .replaceAll("静态", "") + "-" + afl + lcNo + "(" + lcCount + ")");
                         model.setLcNo(model.getLcNo());
                         meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(model);
                     }
@@ -2662,7 +2668,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
                         model.setLcNo(model.getBaseSpotName().replaceAll("#", "")
                                 .replaceAll("轨道衡", "")
                                 .replaceAll("静轨", "")
-                                .replaceAll("静态", "") + "-" + afl + lcNo + "(" + models.size() + ")");
+                                .replaceAll("静态", "") + "-" + afl + lcNo + "(" + lcCount + ")");
                         model.setLcNo(model.getLcNo());
                         meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(model);
                     }