修改

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

@@ -136,10 +136,8 @@ public class TmsshipTotalResultController extends BaseRESTfulController {
             mapVal = new HashMap<>();
         }
         mapVal.put("con",con);
-        if(startTime!=null && endTime!=null){
-            DataChange.queryDataByDateTime(startTime,endTime,mapVal,sdfDateTime);
-        }
-        List<Map<String, Object>> detailListTotal = tmsshipTotalResultService.getCapacity(mapVal);
+        DataChange.queryDataByDateTime(startTime,endTime,mapVal,sdfDateTime);
+        List<Map<String, Object>> detailListTotal = tmsshipTotalResultService.getAllPleaseResult(mapVal);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = tmsshipTotalResultService.getAllPleaseResult(mapVal);

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

@@ -100,9 +100,14 @@ public class ShipDynamicsServiceImpl implements IShipDynamicsService {
         Map<String,Object> pleaseData= shipDynamicsMapper.getPleaseData(map);
         Map<String,Object> map1=new HashMap<>(),map2=new HashMap<>(),map3=new HashMap<>();
         map1.put("dateType","点前剩余计划");
-        map1.put("num",pleaseData.get("surplusSum"));
         map2.put("dateType","当日批复计划");
-        map2.put("num",pleaseData.get("approveSum"));
+        if(pleaseData!=null){
+            map1.put("num",pleaseData.get("surplusSum"));
+            map2.put("num",pleaseData.get("approveSum"));
+        }else{
+            map1.put("num",0);
+            map2.put("num",0);
+        }
         map3.put("dateType","月累计装车量");
         map3.put("num",shipDynamicsMapper.getRealNumberMonth(map));
         list.add(map1);

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

@@ -500,11 +500,11 @@
     from TMSTRAIN_PLEASE_RESULT
     where DELETED=0
     <if test="oneDate != null">
-      and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  INSERT_TIME
+      and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  RESULT_DATE
     </if>
     <if test="startDate != null">
-      and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  INSERT_TIME
-      and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= INSERT_TIME
+      and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  RESULT_DATE
+      and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= RESULT_DATE
     </if>
   </select>
   <select id="getRealNumber" resultType="java.math.BigDecimal">