修改

src/main/java/com/steerinfo/dil/controller/ShipDynamicsController.java

@@ -26,7 +26,7 @@ public class ShipDynamicsController extends BaseRESTfulController {
         List<Map<String, Object>> list = iShipDynamicsService.selectAll();
         if (list.size()==0){
 //            System.out.println("暂时没有位置作业");
-            return failed("暂时没有位置作业");
+            return failed("暂时没有船舶动态");
         }
         List<Map<String, Object>> mapList=new ArrayList<>(list.size());
         //小计，每一个批次进行完小计后清空
@@ -45,10 +45,10 @@ public class ShipDynamicsController extends BaseRESTfulController {
             if(i>0&&!list.get(i).get("batchId").equals(list.get(i-1).get("batchId"))){
                 Map<String,Object> map=new LinkedHashMap<>();
                 map.put("batchId",list.get(i-1).get("batchId"));
-                map.put("pm",list.get(i-1).get("shipName").toString()+
-                        list.get(i-1).get("materialName").toString()+
-                        list.get(i-1).get("dateOfLoans").toString().substring(0, 10)+"放"+
-                        list.get(i-1).get("numberOfLoans").toString()+"吨");
+                map.put("pm",list.get(i).get("materialName").toString() +"\n\n\n\n\n"+
+                        "\""+list.get(i).get("shipName").toString()+"\""+"\n\n\n\n\n"+
+                        list.get(i).get("dateOfLoans").toString().substring(0, 10)+"\n\n\n\n\n"+"放"+
+                        list.get(i).get("numberOfLoans").toString()+"吨");
                 map.put("tonnage",list.get(i-1).get("tonnage"));
                 map.put("portName", list.get(i-1).get("portName"));
                 tonnageSum+=Double.parseDouble(list.get(i-1).get("tonnage").toString());
@@ -85,9 +85,9 @@ public class ShipDynamicsController extends BaseRESTfulController {
             list.get(i).get("materialName").toString();
             list.get(i).get("dateOfLoans").toString().substring(0, 10);
             list.get(i).get("numberOfLoans").toString();
-            String pm=list.get(i).get("shipName").toString()+
-            list.get(i).get("materialName").toString()+
-            list.get(i).get("dateOfLoans").toString().substring(0, 10)+"放"+
+            String pm= list.get(i).get("materialName").toString() +"\n\n\n\n\n"+
+            "\""+list.get(i).get("shipName").toString()+"\""+"\n\n\n\n\n"+
+            list.get(i).get("dateOfLoans").toString().substring(0, 10)+"\n\n\n\n\n"+"放"+
             list.get(i).get("numberOfLoans").toString()+"吨";
             map.put("pm",pm);
             map.put("tonnage",list.get(i).get("tonnage"));