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

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

@@ -373,8 +373,8 @@ public class BMSController extends BaseRESTfulController {
      */
     @ApiModelProperty(value = "生成内转汽运账单")
     @PostMapping("/addConvertedTruckStatement")
-    public RESTfulResult addConvertedTruckStatement(@RequestBody Map<String,Object> map) {
-        return bmstruckFeign.addConvertedTruckStatement(map);
+    public RESTfulResult addConvertedTruckStatement(@RequestBody List<Map<String, Object>> mapList) {
+        return bmstruckFeign.addConvertedTruckStatement(mapList);
     }
 
     /**

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

@@ -1483,6 +1483,27 @@ public class TMSController extends BaseRESTfulController {
         return resTfulResult;
     }
 
-
-
+    @ApiOperation(value="查询所有的包月作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(还没有)", 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("/getTmstruckMonthResult")
+    public Map<String,Object> getTmstruckMonthResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize
+    ){
+        return tmsTruckFeign.getTmstruckMonthResult(mapValue,apiId, pageNum, pageSize);
+    }
+    /**
+     *通过运输订单判断下一步是否需要计量,更新汽车衡到计量实绩中
+     */
+    @PostMapping("/updateTruckCalculate/{orderId}")
+    public Map<String,Object> updateTruckCalculate(@PathVariable("orderId") Integer orderId){
+        return tmsTruckFeign.isNextNeedJl(orderId);
+    }
 }

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

@@ -87,7 +87,7 @@ public interface BmstruckFeign {
      * 生成内转汽运账单
      */
     @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/addConvertedTruckStatement")
-    RESTfulResult addConvertedTruckStatement(@RequestBody(required = false) Map<String, Object> map);
+    RESTfulResult addConvertedTruckStatement(@RequestBody(required = false) List<Map<String, Object>> mapList);
     /**
      *删除汽运账单
      */

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

@@ -231,6 +231,19 @@ public interface TmsTruckFeign {
 
     @GetMapping("api/v1/truckTms/dropDown/getFuMaterial/{type}")
     Map<String, Object> getFuMaterial(@PathVariable("type")Integer type);
+    /**
+     * 包月总实绩
+     */
+    @PostMapping("api/v1/truckTms/tmstrucktotalresults/getTmstruckMonthResult")
+    Map<String,Object> getTmstruckMonthResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                       @RequestParam("apiId")    Integer apiId,
+                                       @RequestParam("pageNum")  Integer pageNum,
+                                       @RequestParam("pageSize") Integer pageSize);
+    /**
+     *通过运输订单判断下一步是否需要计量,更新汽车衡到计量实绩中
+     */
+    @PostMapping("api/v1/truckTms/tmstruckweightresults/{orderId}")
+    Map<String,Object> isNextNeedJl(@PathVariable("orderId") Integer orderId);
 }