修改

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -1065,41 +1065,39 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             for (MeterWorkCarActual model: models) {
                 //循环每一个结净记录
                 //委托不能为空
-                if(StringUtils.isNotEmpty(model.getPredictionNo())){
-                    // 改委托
-                    PreTrackScale scale = new PreTrackScale();
-                    if (StringUtils.isNotEmpty(model.getPredictionNo())) {
-                        scale = preTrackScaleMapper.selectByPrimaryKey(model.getPredictionNo());
-                        scale.setValueFlag("1");
-                        scale.setUploadFlag("1");
-                        scale.setUpdateTime(new Date());
-                        scale.setUpdateManNo(userId);
-                        scale.setUpdateManName(userName);
-                        preTrackScaleMapper.updateByPrimaryKeySelective(scale);
-                    }else {
-                        if(StringUtils.isNotEmpty(model.getActualFirst1No())) {
-                            MeterWorkCarActualFirst gross = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst1No());
-                            if(StringUtils.isNotEmpty(gross.getPredictionNo())) {
-                                scale = preTrackScaleMapper.selectByPrimaryKey(gross.getPredictionNo());
-                                scale.setValueFlag("1");
-                                scale.setUploadFlag("1");
-                                scale.setUpdateTime(new Date());
-                                scale.setUpdateManNo(userId);
-                                scale.setUpdateManName(userName);
-                                preTrackScaleMapper.updateByPrimaryKeySelective(scale);
-                            }
+                // 改委托
+                PreTrackScale scale = new PreTrackScale();
+                if (StringUtils.isNotEmpty(model.getPredictionNo())) {
+                    scale = preTrackScaleMapper.selectByPrimaryKey(model.getPredictionNo());
+                    scale.setValueFlag("1");
+                    scale.setUploadFlag("1");
+                    scale.setUpdateTime(new Date());
+                    scale.setUpdateManNo(userId);
+                    scale.setUpdateManName(userName);
+                    preTrackScaleMapper.updateByPrimaryKeySelective(scale);
+                }else {
+                    if(StringUtils.isNotEmpty(model.getActualFirst1No())) {
+                        MeterWorkCarActualFirst gross = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst1No());
+                        if(StringUtils.isNotEmpty(gross.getPredictionNo())) {
+                            scale = preTrackScaleMapper.selectByPrimaryKey(gross.getPredictionNo());
+                            scale.setValueFlag("1");
+                            scale.setUploadFlag("1");
+                            scale.setUpdateTime(new Date());
+                            scale.setUpdateManNo(userId);
+                            scale.setUpdateManName(userName);
+                            preTrackScaleMapper.updateByPrimaryKeySelective(scale);
                         }
-                        if(StringUtils.isNotEmpty(model.getActualFirst2No())) {
-                            MeterWorkCarActualFirst tare = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
-                            if(StringUtils.isNotEmpty(tare.getPredictionNo())) {
-                                scale = preTrackScaleMapper.selectByPrimaryKey(tare.getPredictionNo());
-                                scale.setValueFlag("1");
-                                scale.setUploadFlag("1");
-                                scale.setUpdateTime(new Date());
-                                scale.setUpdateManNo(userId);
-                                scale.setUpdateManName(userName);
-                                preTrackScaleMapper.updateByPrimaryKeySelective(scale);
-                            }
+                    }
+                    if(StringUtils.isNotEmpty(model.getActualFirst2No())) {
+                        MeterWorkCarActualFirst tare = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
+                        if(StringUtils.isNotEmpty(tare.getPredictionNo())) {
+                            scale = preTrackScaleMapper.selectByPrimaryKey(tare.getPredictionNo());
+                            scale.setValueFlag("1");
+                            scale.setUploadFlag("1");
+                            scale.setUpdateTime(new Date());
+                            scale.setUpdateManNo(userId);
+                            scale.setUpdateManName(userName);
+                            preTrackScaleMapper.updateByPrimaryKeySelective(scale);
                         }
                     }
                 }

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

@@ -4698,6 +4698,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             String no = PublicMethod.IdCreate(3);
             secondDb.setActualFirstNo(no);
 
+            if(StringUtils.isNotEmpty(secondDb.getPredictionNo())) {
+                secondDb.setIsPreScale("1");
+            }
             secondDb.setValueFlag("2");//结净
             secondDb.setCreateTime(new Date());
             meterWorkCarActualFirstMapper.insertSelective(secondDb);

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

@@ -75,10 +75,12 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
                 long countBallIdentify = 0L;
                 //球机车号未识别数
                 long countBallIdentifyTemp = 0L;
+                long countBallIdentifyTemp02 = 0L;
                 //枪机车号识别数
                 long countGunIdentify = 0L;
                 //枪机车号未识别数
                 long countGunIdentifyTemp = 0L;
+                long countGunIdentifyTemp02 = 0L;
                 //视觉识别数
                 long countVisualIdentify = 0L;
                 //视觉未识别数
@@ -122,6 +124,9 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
                             && (StringUtils.isEmpty(model.getVideoCarNo1())
                             ||  (model.getCarNoType().equals("2")
                             && StringUtils.isNotEmpty(model.getRfidCarNo())))).count()-countRfidIdentify;
+                    countBallIdentifyTemp02 = models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                            && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                            && (StringUtils.isEmpty(model.getVideoCarNo1()))).count();
                     //枪机车号识别数
                     countGunIdentify = models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                             && model.getBaseSpotName().equals(spot.getBaseSpotName())
@@ -130,6 +135,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;
+                    countGunIdentifyTemp02 = models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                            && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                            && StringUtils.isEmpty(model.getVideoCarNo2())).count();
                     //视觉识别数
                     countVisualIdentify = models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                             && model.getBaseSpotName().equals(spot.getBaseSpotName())
@@ -177,16 +185,20 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
                             && StringUtils.isNotEmpty(model.getVideoCarNo1())
                             && !model.getVideoCarNo1().equals(model.getFirstCarNo()) ).count();
                     //枪机车号识别率------枪机车号识别数/一次计量车数
-                    if(countCarFirst != 0) {
+                    if((countCarFirst-countRfidIdentify)-countGunIdentifyTemp <= (countCarFirst-countRfidIdentify)) {
                         countGunIndentifyRate = Math.round(((countCarFirst-countRfidIdentify)-countGunIdentifyTemp)/((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;
                     }
                     //枪机识别准确率------（枪机识别车号数-枪机识别错误修正数）/枪机识别车号数c
                     if(countGunIdentify != 0) {
                         countGunIndentifyAccuracyRate = Math.round((countGunIdentify-countGunResetCar)/(countGunIdentify*1.0)*100*100)/100.0; //(Math.round((*100))/100.0;
                     }
                     //球机车号识别率
-                    if(countCarFirst != 0) {
+                    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;
                     }
                     //球机识别准确率
                     if(countBallIdentify != 0) {

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

@@ -4701,6 +4701,9 @@
     <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
       and  A.net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and A.net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
     </if>
+    <if test="railwayNo != null and railwayNo != ''">
+      and A.RAILWAY_NO LIKE '%${railwayNo}%'
+    </if>
   order by A.net_time desc
   </select>
 </mapper>

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

@@ -2825,18 +2825,44 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             for (MeterWorkRailwayActual model: models) {
                 //循环每一个结净记录
                 //委托不能为空
-                if(model.getPredictionNo() != null){
-                    // 改委托
-                    if (StringUtils.isNotEmpty(model.getPredictionNo())) {
-                        PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
-                        scale.setValueFlag("1");
-                        scale.setUploadFlag("1");
-                        scale.setUpdateTime(new Date());
-                        scale.setUpdateManNo(userId);
-                        scale.setUpdateManName(userName + ":结净废除操作");
-                        preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
+
+                // 改委托
+                PreRailwayScale scale = new PreRailwayScale();
+                if (StringUtils.isNotEmpty(model.getPredictionNo())) {
+                    scale= preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
+                    scale.setValueFlag("1");
+                    scale.setUploadFlag("1");
+                    scale.setUpdateTime(new Date());
+                    scale.setUpdateManNo(userId);
+                    scale.setUpdateManName(userName + ":结净废除操作");
+                    preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
+                }else {
+                    if(StringUtils.isNotEmpty(model.getActualFirst1No())) {
+                        MeterWorkRailwayActFirst gross = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirst1No());
+                        if(StringUtils.isNotEmpty(gross.getPredictionNo())) {
+                            scale = preRailwayScaleMapper.selectByPrimaryKey(gross.getPredictionNo());
+                            scale.setValueFlag("1");
+                            scale.setUploadFlag("1");
+                            scale.setUpdateTime(new Date());
+                            scale.setUpdateManNo(userId);
+                            scale.setUpdateManName(userName);
+                            preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
+                        }
+                    }
+                    if(StringUtils.isNotEmpty(model.getActualFirst2No())) {
+                        MeterWorkRailwayActFirst tare = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
+                        if(StringUtils.isNotEmpty(tare.getPredictionNo())) {
+                            scale = preRailwayScaleMapper.selectByPrimaryKey(tare.getPredictionNo());
+                            scale.setValueFlag("1");
+                            scale.setUploadFlag("1");
+                            scale.setUpdateTime(new Date());
+                            scale.setUpdateManNo(userId);
+                            scale.setUpdateManName(userName);
+                            preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
+                        }
                     }
                 }
+
                 // 清空一次毛重、皮重委托信息
                 MeterWorkRailwayActFirst firstGross;
                 MeterWorkRailwayActFirst firstTare;