dengyj 3 năm trước cách đây
mục cha
commit
a889f58625

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

@@ -239,7 +239,7 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
                     if(((countCarFirst-countRfidIdentify)-countBallIdentifyTemp) <= (countCarFirst-countRfidIdentify)) {
                         countBallIndentifyRate = Math.round(((countCarFirst-countRfidIdentify)-countBallIdentifyTemp)/((countCarFirst-countRfidIdentify)*1.0)*100*100)/100.0; //(Math.round(*100))/100.0;
                     }else {
-                        countGunIndentifyRate = Math.round(((countCarFirst-countRfidIdentify)-countGunIdentifyTemp02)/((countCarFirst-countRfidIdentify)*1.0)*100*100)/100.0; //(Math.round(*100))/100.0;
+                        countBallIndentifyRate = Math.round(((countCarFirst-countRfidIdentify)-countBallIdentifyTemp02)/((countCarFirst-countRfidIdentify)*1.0)*100*100)/100.0; //(Math.round(*100))/100.0;
                     }
                     //球机识别准确率
                     if(countBallIdentify != 0) {

+ 2 - 2
src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -7194,7 +7194,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 int lcCount = 0;
                 for (MeterWorkRailwayActFirst model : models) {
                     MeterWorkRailwayActFirst actFirst = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirstNo());
-                    if(actFirst != null && StringUtils.isNotEmpty(actFirst.getLcNo())) {
+                    if(!(actFirst != null && StringUtils.isNotEmpty(actFirst.getLcNo()) && !actFirst.getLcNo().equals("无列次"))) {
                         lcCount ++;
                     }
                 }
@@ -7205,7 +7205,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
                 for (MeterWorkRailwayActFirst model : models) {
                     MeterWorkRailwayActFirst actFirst = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirstNo());
-                    if(actFirst != null && StringUtils.isNotEmpty(actFirst.getLcNo())) {
+                    if(actFirst != null && StringUtils.isNotEmpty(actFirst.getLcNo()) && !actFirst.getLcNo().equals("无列次")) {
                         continue;
                     }
                     MeterBaseOperationLog logModel = new MeterBaseOperationLog();