后端修改

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

@@ -161,14 +161,14 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             String no = PublicMethod.IdCreate(3);
             model.setActualFirstNo(no);
             model.setCreateTime(new Date());
+            meterWorkRailwayActFirstMapper.insertSelective(model);
             if(model.getPredictionNo() != null && StringUtils.isNotEmpty(model.getPredictionNo())) {
                 MeterWorkRailwayActFirst modelTemp = meterWorkRailwayActFirstMapper.selectAndMatch(model.getActualFirstNo(), model.getPredictionNo());
                 BeanUtils.copyProperties(modelTemp, model);
                 model.setPredictionType("1");
                 model.setIsPreSacale("1");
             }
-            int i = meterWorkRailwayActFirstMapper.insertSelective(model);
-
+            int i = meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model);
             if (i >= 1) {
                 firsts.add(model);
             }
@@ -383,7 +383,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             }
             model.setValueFlag("0");
             int num = meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model);
-            if (StringUtils.isNotEmpty(model.getPredictionNo())) {
+            if (model.getPredictionNo() != null && StringUtils.isNotEmpty(model.getPredictionNo())) {
                 PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
                 if (scale != null && StringUtils.isNotEmpty(scale.getPredictionNo())) {
                     scale.setPredictionNo(model.getPredictionNo());