Merge branch 'dev'

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

@@ -1069,7 +1069,7 @@ public class AMScontroller{
     }
     //删除用车需求
     @PostMapping("/deleteTruckRequirement/{requirementId}")
-    public Map<String,Object> deleteTruckRequirement(@PathVariable("requirementId") BigDecimal requirementId) {
+    public Map<String,Object> deleteTruckReqgetTruckRequirementListuirement(@PathVariable("requirementId") BigDecimal requirementId) {
         return amsFeign.deleteTruckRequirement(requirementId);
     }
     //下发用车需求

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

@@ -1818,9 +1818,11 @@ public class TMSController extends BaseRESTfulController {
                                               Integer pageNum,
                                               Integer pageSize,
                                               String con,
-                                              String  userId
+                                              String  userId,
+                                              String startTime,
+                                              String endTime
     ){
-        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con,userId);
+        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con,userId,startTime,endTime);
     }
 
     @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
@@ -1933,7 +1935,8 @@ public class TMSController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               String startTime, String endTime,
+                                               String startTime,
+                                               String endTime,
                                                Integer orderType
     ){
         return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType);
@@ -1944,7 +1947,8 @@ public class TMSController extends BaseRESTfulController {
                                           Integer apiId,
                                           Integer pageNum,
                                           Integer pageSize,
-                                          String startTime, String endTime,
+                                          String startTime,
+                                          String endTime,
                                           String carrierSsoId
     ){
         return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId);
@@ -2011,6 +2015,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 +2068,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

@@ -197,7 +197,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

@@ -330,7 +330,9 @@ public interface TmsTruckFeign {
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize,
                                               @RequestParam("con") String con,
-                                              @RequestParam("userId") String userId);
+                                              @RequestParam("userId") String userId,
+                                              @RequestParam("startTime") String startTime,
+                                              @RequestParam("endTime") String endTime);
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/addDaZhouToDaGangLoadResult")
     Map<String, Object> addDaZhouToDaGangLoadResult(@RequestBody(required = false)Map<String, Object> map);
@@ -477,6 +479,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/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -753,9 +753,10 @@
                RCT.CAPACITY_TYPE_NAME "capacityTypeName"
         from RMS_CAPACITY_TYPE RCT
         <if test="index!=null">
-         where   instr( RCT.CAPACITY_TYPE_NAME, #{index}) > 0
+        where instr( RCT.CAPACITY_TYPE_NAME, #{index}) > 0
         </if>
 
+
     </select>
     <select id="getPlanCount" resultType="java.lang.Integer">
         SELECT
@@ -766,5 +767,6 @@
         WHERE
             AIR.REQUIREMENT_STATUS = 2
           AND AIR.DELETED = 0
+>>>>>>> 2575cdbb9e23d44b2db153432ead44f438969766
     </select>
 </mapper>