'提交'

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/controller/MeterWorkRailwayActFirstController.java

@@ -1652,4 +1652,15 @@ throw new MarkerMetException(500, "操作异常！！");
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "获取嘉北一号公路数据一次数据", notes = "根据MeterWorkCarActualFirst对象创建")
+    @GetMapping(value = "/get01")
+    public RESTfulResult get01(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        if(parmas==null){
+            parmas=new HashMap();
+        }
+        parmas.put("baseSpotName","嘉北1#轨道衡");
+        PageList<MeterWorkRailwayActFirst> meterWorkRailwayActFirsts = meterWorkRailwayActFirstService.queryForPage(parmas, pageNum, pageSize);
+        return success(meterWorkRailwayActFirsts);
+    }
 }

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

@@ -1219,6 +1219,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         mwca.setValueFlag("1");
         mwca.setIsPreSacale("0");
         mwca.setUploadFlag("1");
+        mwca.setNote(model.getNote());
         meterWorkRailwayActualMapper.updateByPrimaryKey(mwca);
 
         MeterBaseOperationLog logModel = new MeterBaseOperationLog();

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/service/impl/MeterWorkRailwayReceivedServiceImpl.java

@@ -43,6 +43,7 @@ import java.util.Date;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
+import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 /**
@@ -539,7 +540,12 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
                 MeterWorkRailwayReceived upBefore = meterWorkRailwayReceivedMapper.selectByPrimaryKey(model.getActualFirstNo());
                 //修改操作原因memo
                 String memo = model.getMemo();
-                String substring = memo.substring(memo.indexOf("作废原因：")+5, memo.indexOf("，数据信息："));
+                String substring = "";
+                try {
+                    substring = memo.substring(memo.indexOf("作废原因：")+5, memo.indexOf("，数据信息："));
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
                 model.setMemo(substring);
 
                 model.setValueFlag("0");