修改

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

@@ -257,4 +257,16 @@ public class ShipDynamicsController extends BaseRESTfulController {
         mapList.add(map4);
         return success(mapList);
     }
+
+    @ApiOperation(value="万州港装车出库数据")
+    @PostMapping("/getLoadData")
+    public RESTfulResult getLoadData(@RequestBody(required = false)Map<String,Object> mapVal){
+        return success(iShipDynamicsService.getLoadData(mapVal));
+    }
+
+    @ApiOperation(value="万州港装车出库数据")
+    @PostMapping("/getUnloadData")
+    public RESTfulResult getUnloadData(@RequestBody(required = false)Map<String,Object> mapVal){
+        return success(iShipDynamicsService.getUnloadData(mapVal));
+    }
 }

src/main/java/com/steerinfo/dil/mapper/ShipDynamicsMapper.java

@@ -11,4 +11,8 @@ public interface ShipDynamicsMapper {
     //查询船舶动态表
     List<Map<String, Object>> selectAll(Map<String,Object> map);
     List<Map<String, Object>> selectByshipName(String shipName, String materialName);
+
+    List<Map<String, Object>> getLoadData(Map<String,Object> map);
+
+    List<Map<String, Object>> getUnloadData(Map<String,Object> map);
 }

src/main/java/com/steerinfo/dil/service/IShipDynamicsService.java

@@ -9,4 +9,10 @@ public interface IShipDynamicsService {
     List<Map<String, Object>> selectAll(Map<String,Object> map);
     //通过外轮船名，物资名称查询视图中的江船状态数据
     List<Map<String, Object>> selectByshipName(String shipName, String materialName);
+
+    List<Map<String, Object>> getLoadData(Map<String,Object> map);
+
+    List<Map<String, Object>> getUnloadData(Map<String,Object> map);
+
+
 }

src/main/java/com/steerinfo/dil/service/impl/ShipDynamicsServiceImpl.java

@@ -2,9 +2,11 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.ShipDynamicsMapper;
 import com.steerinfo.dil.service.IShipDynamicsService;
+import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Map;
 
@@ -13,6 +15,7 @@ public class ShipDynamicsServiceImpl implements IShipDynamicsService {
     @Autowired
     ShipDynamicsMapper shipDynamicsMapper;
 
+    private final SimpleDateFormat sdfDateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     //获取视图里的所有外轮船名，物资名称
     public List<Map<String, Object>> selectAll(Map<String,Object> map) {
         return shipDynamicsMapper.selectAll(map);
@@ -25,4 +28,16 @@ public class ShipDynamicsServiceImpl implements IShipDynamicsService {
         return shipDynamicsMapper.selectByshipName(shipName,materialName);
     }
 
+    @Override
+    public List<Map<String, Object>> getLoadData(Map<String,Object> map){
+        String startTime=map.get("startTime")+"";
+        String endTime=map.get("endTime")+"";
+        DataChange.queryDataByDateTime(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
+        return shipDynamicsMapper.getLoadData(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> getUnloadData(Map<String,Object> map){
+        return shipDynamicsMapper.getUnloadData(map);
+    }
 }

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

@@ -86,4 +86,41 @@
                sd.LOCATION_STATUS as "locationStatus"
         from SHIP_DYNAMICS sd where sd.RESULT_FOREIGN_SHIP_NAME=#{shipName} and sd.MATERIAL_NAME=#{materialName} and sd.LOCATION_STATUS is not null
     </select>
+    <select id="getLoadData" resultType="java.util.Map">
+        select COUNT(TLT.RESULT_ID) as "num",
+               DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+               rm.MATERIAL_NAME "materialName",
+               '港口装车数据' "dataType"
+        from TMSTRAIN_LOADING_TEMP TLT
+                 LEFT JOIN WMSH_OUTBOUND_RESULT WOR
+                           ON WOR.RESULT_ID = TLT.OUTBOUNT_ID
+                 LEFT JOIN DIL_BATCH DB
+                           ON WOR.BATCH_ID = DB.BATCH_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON DB.MATERIAL_ID = RM.MATERIAL_ID
+        <where>
+            <if test="input !=null and input.toString()!=''">
+                 DB.RESULT_FOREIGN_SHIP_NAME || rm.MATERIAL_NAME like concat('%',concat(#{input},'%'))
+            </if>
+            <if test="startDate != null">
+                and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  WOR.INSERT_TIME
+                and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= WOR.INSERT_TIME
+            </if>
+        </where>
+        GROUP BY rm.MATERIAL_NAME,DB.RESULT_FOREIGN_SHIP_NAME
+    </select>
+    <select id="getUnloadData" resultType="java.util.Map">
+        --卸船明细
+        SELECT
+            ( CASE WHEN TTR.SHIP_STATUS = 1 THEN '已卸船数' ELSE '待卸船数' END ) AS "status",
+            COUNT(TTR.SHIP_STATUS) AS "num",
+            '港口卸船数据' "dataType"
+        FROM
+            TMSSHIP_TOTAL_RESULT TTR
+                LEFT JOIN TMSSHIP_UNLOAD_SHIP_RESULT TUSR ON TUSR.TOTAL_RESULT_ID = TTR.RESULT_ID
+                LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY OIC ON TTR.ORDER_ID = OIC.INSTRUCTIONS_CAPACITY_ID
+                LEFT JOIN RMS_CAPACITY RC ON OIC.CAPACITY_ID = RC.CAPACITY_ID
+        WHERE TUSR.DELETED=0
+        GROUP BY TTR.SHIP_STATUS
+    </select>
 </mapper>