修改内转计时

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

@@ -2011,6 +2011,8 @@ public class TMSController extends BaseRESTfulController {
                                                           String endTime) {
         return tmsTruckFeign.getInwardReport(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime);
     }
+
+
     @PostMapping("/sendMeasureCommission")
     public Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map){
         return  tmsTruckFeign.sendMeasureCommission(map);
@@ -2062,6 +2064,23 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getLoading(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
     }
 
+
+    @ApiOperation(value="对内转车辆装货点进行统计")
+    @PostMapping("/getLoaderResult")
+    public Map<String, Object> getLoaderResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          String startTime,
+                                          String endTime
+    ){
+        return tmsTruckFeign.getLoaderResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
+
+
+
+
+
     @ApiOperation(value="对内转车辆装卸货点进行统计")
     @PostMapping("/getUnLoading")
     public Map<String, Object> getUnLoading(@RequestBody(required=false) Map<String,Object> mapValue,

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

@@ -198,7 +198,7 @@ public class UniversalController extends BaseRESTfulController {
         if(mapValue == null){
             mapValue = new HashMap<>();
         }
-        if(index != null){
+        if(index != null&&!index.equals("null")){
             mapValue.put("index", index);
         }
         //不分页筛选数据

src/main/java/com/steerinfo/dil/feign/TmsTruckFeign.java

@@ -477,6 +477,15 @@ public interface TmsTruckFeign {
                                      @RequestParam String endTime);
 
 
+    @PostMapping("api/v1/truckTms/statisticalReport/getLoaderResult")
+    Map<String, Object> getLoaderResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam String startTime,
+                                     @RequestParam String endTime);
+
+
     @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/JudgeTimeTask")
     Map<String, Object> JudgeTimeTask(@RequestBody Map<String, Object> map);
 

src/main/resources/application-dev.yml

@@ -22,7 +22,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
@@ -30,9 +30,9 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:localhost:8016}
+    url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:localhost:8014}
+    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
 server:

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

@@ -752,6 +752,8 @@
         select RCT.CAPACITY_TYPE_ID "capacityTypeId",
                RCT.CAPACITY_TYPE_NAME "capacityTypeName"
         from RMS_CAPACITY_TYPE RCT
+        <if test="index!=null">
         where instr( RCT.CAPACITY_TYPE_NAME, #{index}) > 0
+        </if>
     </select>
 </mapper>