修改采购进口矿

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

@@ -47,8 +47,8 @@ public class ShipDynamicsController extends BaseRESTfulController {
                 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());
+                        list.get(i-1).get("dateOfLoans").toString().substring(0, 10)+"放"+
+                        list.get(i-1).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());

src/main/resources/com/steerinfo/dil/mapper/ShipDynamicsMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.ShipDynamicsMapper">
-<!--   获取数据  -->
+<!-- 获取船舶动态表数据  -->
     <select id="selectAll" resultType="java.util.Map" parameterType="java.util.Map">
         select db.BATCH_ID "batchId",
                db.result_foreign_ship_name "shipName",
@@ -17,7 +17,7 @@
                tsl.LOCATION_STATUS "locationStatus",
                tsl.LOCATION_VALUE "locationValue",
                tsl.LOCATION_ROUTE_TIME
-        from DIL_BATCH db
+                 from DIL_BATCH db
                  join rms_material rm on db.material_id=rm.material_id
                  left join AMSSHIP_CARGO_TRANSFER_RESULT actr on db.batch_id=actr.batch_id
                  left join AMSSHIP_DELIVERY_NOTICE adn on adn.batch_id=db.batch_id