|
@@ -56,9 +56,10 @@ public class RmsMaterialTypeController extends BaseRESTfulController {
|
|
if (con != null && !"null".equals(con)){
|
|
if (con != null && !"null".equals(con)){
|
|
mapValue.put("con","%" + con + "%");
|
|
mapValue.put("con","%" + con + "%");
|
|
}
|
|
}
|
|
|
|
+ PageHelper.startPage(pageNum, pageSize);
|
|
//分页查询数据
|
|
//分页查询数据
|
|
List<Map<String, Object>> columnList = rmsMaterialTypeService.getMaterialTypeList(mapValue);
|
|
List<Map<String, Object>> columnList = rmsMaterialTypeService.getMaterialTypeList(mapValue);
|
|
- PageHelper.startPage(pageNum, pageSize);
|
|
|
|
|
|
+
|
|
PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
|
|
PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
|
|
return success(data);
|
|
return success(data);
|
|
}
|
|
}
|
|
@@ -80,9 +81,9 @@ public class RmsMaterialTypeController extends BaseRESTfulController {
|
|
if(con != null){
|
|
if(con != null){
|
|
mapValue.put("con","%" + con + "%");
|
|
mapValue.put("con","%" + con + "%");
|
|
}
|
|
}
|
|
|
|
+ PageHelper.startPage(pageNum, pageSize);
|
|
//分页查询数据
|
|
//分页查询数据
|
|
List<Map<String, Object>> columnList = rmsMaterialTypeService.getInwardContractMaterial(mapValue);
|
|
List<Map<String, Object>> columnList = rmsMaterialTypeService.getInwardContractMaterial(mapValue);
|
|
- PageHelper.startPage(pageNum, pageSize);
|
|
|
|
PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
|
|
PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
|
|
return success(data);
|
|
return success(data);
|
|
}
|
|
}
|