Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API into dev

pom.xml

@@ -118,7 +118,6 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                    <param>AMSTRUCK_RAIL_DAYPLAN</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -501,7 +501,7 @@ public class OMSController {
         return map;
     }
 
-    @ApiOperation(value="根据运单id关闭订单")
+    @ApiOperation(value="siji")
     @PostMapping("/getCapacityAndDriverList")
     public Map<String, Object> getCapacityAndDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
                                                         Integer apiId,

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

@@ -1428,9 +1428,11 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getQualityResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           Integer apiId,
                                           Integer pageNum,
-                                          Integer pageSize,String con
+                                          Integer pageSize,
+                                          Integer orderType,
+                                          String con
     ){
-        return tmsTruckFeign.getQualityResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
+        return tmsTruckFeign.getQualityResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,orderType, con);
     }
 
     @ApiOperation(value = "通过ID获取质检实绩 ")
@@ -1649,7 +1651,7 @@ public class TMSController extends BaseRESTfulController {
     @ApiOperation(value = "查询计数实绩列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId(364)", value = "动态表头", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
@@ -1660,7 +1662,7 @@ public class TMSController extends BaseRESTfulController {
                                                Integer pageNum,
                                                Integer pageSize
     ) {
-        return tmsTruckFeign.selectCountList(mapValue, apiId, pageNum, pageSize);
+        return tmsTruckFeign.selectCountList(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
     }
 
     /**
@@ -1693,7 +1695,7 @@ public class TMSController extends BaseRESTfulController {
                                                       Integer pageNum,
                                                       Integer pageSize
     ) {
-        return tmsTruckFeign.getTmstruckMonthResult(mapValue, apiId, pageNum, pageSize);
+        return tmsTruckFeign.getTmstruckMonthResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
     }
 
     /**
@@ -1736,4 +1738,22 @@ public class TMSController extends BaseRESTfulController {
     public Map<String ,Object> getEnfactoryMessageByOrderId(String orderNumber) {
         return tmsTruckFeign.getEnfactoryMessageByOrderId(orderNumber);
     }
+
+    @ApiOperation(value="查询计皮实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(363)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllTimeTaskResult")
+    public RESTfulResult getAllTimeTaskResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String con
+    ){
+        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con);
+    }
 }

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

@@ -215,6 +215,7 @@ public interface TmsTruckFeign {
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam("orderType") Integer orderType,
                                           @RequestParam("con")String con);
 
 
@@ -225,11 +226,13 @@ public interface TmsTruckFeign {
     @PostMapping("api/v1/truckTms/tmstruckqualityresults/updateQualityResult")
     public Map<String, Object> updateQualityResult(@RequestBody(required=false) Map<String,Object> mapValue);
 
-    @PostMapping("api/v1/truckTms/tmstruckqualityresults/selectQualityResultForConverted")
+    //查询质检实绩
+    @PostMapping("api/v1/truckTms/tmstruckqualityresults/getQualityResult")
     Map<String,Object> selectQualityResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
                                                        @RequestParam("apiId")    Integer apiId,
                                                        @RequestParam("pageNum")  Integer pageNum,
                                                        @RequestParam("pageSize") Integer pageSize);
+
     /**
      * TmstruckTotalResult
      */
@@ -303,6 +306,13 @@ public interface TmsTruckFeign {
     @ApiOperation(value="APP通过运输订单id查询进厂实绩")
     @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/getEnfactoryMessageByOrderId")
     Map<String, Object> getEnfactoryMessageByOrderId(@RequestParam String orderNumber);
+
+    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/getAllTimeTaskResult")
+    public RESTfulResult getAllTimeTaskResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("con") String con);
 }