dengyj há 3 anos atrás
pai
commit
ccf2d1962f

+ 1 - 1
src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

@@ -7420,7 +7420,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
     @Override
     @Transactional
-    public RESTfulResult    localRecoveryOrAbolishByFirstNo(MeterWorkCarActualFirst firstModel) {
+    public RESTfulResult localRecoveryOrAbolishByFirstNo(MeterWorkCarActualFirst firstModel) {
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
         try{

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

@@ -880,7 +880,7 @@
             A.rfid_car_no rfidIdentifyRfidCarNo,
             A.car_no rfidIdentifyCarNo,
             case when A.car_no_type = '1' then '视觉识别'
-                 when A.car_no_type = '2' then 'Rfid识别'
+                 when A.car_no_type in ('2', '0') then 'Rfid识别'
                  when A.car_no_type = '3' then '扫码识别'
                  when A.car_no_type = '4' then '车号重置'
                  else null end carNoType,

+ 4 - 0
src/main/java/com/steerinfo/meterwork/meterworkdatacount/service/impl/MeterWorkDataCountServiceImpl.java

@@ -957,6 +957,7 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
             for(MeterBaseSpotInfo spotModel: spotModels) {
                 long countFirst = 0L;
                 long countIdentifyYes = 0L;
+                double countIdentifyRate = 0.0;
                 long countIdentifyNo = 0L;
                 long countOtherIdentify = 0L;
                 if(rfidIdentifyList.size() >= 1) {
@@ -969,6 +970,8 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                             && item.getBaseSpotName().equals(spotModel.getBaseSpotName())
                             && item.getCarNoType().equals("Rfid识别")
                             && StringUtils.isNotEmpty(item.getRfidIdentifyRfidCarNo())).count();
+                    //Rfid识别率
+                    countIdentifyRate = Math.round((countIdentifyYes)/(countFirst*1.0)*100*100)/100.0;
                     //Rfid未识别总数
                     countIdentifyNo = rfidIdentifyList.stream().filter(item -> item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
                             && item.getBaseSpotName().equals(spotModel.getBaseSpotName())
@@ -984,6 +987,7 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                 map.put("baseSpotName", spotModel.getBaseSpotName());
                 map.put("countFirst", countFirst);
                 map.put("countIdentifyYes", countIdentifyYes);
+                map.put("countIdentifyRate", countIdentifyRate);
                 map.put("countIdentifyNo", countIdentifyNo);
                 map.put("countOtherIdentify", countOtherIdentify);
                 mapList.add(map);