|
@@ -218,6 +218,7 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
|
|
mapValue.put("wagon",wagon);
|
|
mapValue.put("wagon",wagon);
|
|
mapValue.put("purchaseOrderNum",purchaseOrderNum);
|
|
mapValue.put("purchaseOrderNum",purchaseOrderNum);
|
|
mapValue.put("materialName",materialName);
|
|
mapValue.put("materialName",materialName);
|
|
|
|
+
|
|
//不分页筛选数据
|
|
//不分页筛选数据
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
//分页数据
|
|
//分页数据
|
|
@@ -379,23 +380,18 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- @ApiOperation(value = "根据物资名和外轮船名查询采购订单号")
|
|
|
|
|
|
+ @ApiOperation(value = "查询临时表中的resultType的未绑定实绩的车皮")
|
|
@PostMapping(value = "/getResultType")
|
|
@PostMapping(value = "/getResultType")
|
|
public RESTfulResult getResultType(@RequestBody(required = false) Map<String, Object> map,
|
|
public RESTfulResult getResultType(@RequestBody(required = false) Map<String, Object> map,
|
|
Integer apiId,
|
|
Integer apiId,
|
|
- Integer pageNum,
|
|
|
|
- Integer pageSize,
|
|
|
|
String con
|
|
String con
|
|
) {
|
|
) {
|
|
|
|
|
|
if (con!=null&&!"".equals(con)){
|
|
if (con!=null&&!"".equals(con)){
|
|
map.put("con",con);
|
|
map.put("con",con);
|
|
}
|
|
}
|
|
- //不分页筛选数据
|
|
|
|
- PageHelper.startPage(pageNum, pageSize);
|
|
|
|
//分页数据
|
|
//分页数据
|
|
List<Map<String, Object>> mes = tmstrainLoadingResultService.getResultType(map);
|
|
List<Map<String, Object>> mes = tmstrainLoadingResultService.getResultType(map);
|
|
- PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, mes);
|
|
|
|
- return success(pageList);
|
|
|
|
|
|
+ return success(mes);
|
|
}
|
|
}
|
|
}
|
|
}
|