diff --git a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java index 6a5272f6..a889467c 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -337,7 +337,7 @@ public class DataEaseController extends Controller { //根据区域码,获取区域名称 String area_name = rm.getAreaName(area_code); - Page pageList = dm.getDataSetContent(id, identity_id, area_name,keyword, pageNumber, pageSize); + Page pageList = dm.getDataSetContent(id, identity_id, area_name, keyword, pageNumber, pageSize); renderJson(CommonUtil.renderJsonForLayUI(pageList)); } @@ -394,7 +394,7 @@ public class DataEaseController extends Controller { @Before(GET.class) @IsLoginInterface({}) @IsNumericInterface({"id"}) - public void getDataSetContentByCity(int id,String keyword, int pageNumber, int pageSize) { + public void getDataSetContentByCity(int id, String keyword, int pageNumber, int pageSize) { if (pageNumber == 0) pageNumber = 1; if (pageSize == 0) pageSize = 20; //登录的人员 @@ -406,7 +406,7 @@ public class DataEaseController extends Controller { //根据区域码,获取区域名称 String area_name = rm.getAreaName(area_code); - Page list = dm.getDataSetContentByCity(id,keyword, area_name, pageNumber, pageSize); + Page list = dm.getDataSetContentByCity(id, keyword, area_name, pageNumber, pageSize); renderJson(CommonUtil.renderJsonForLayUI(list)); } @@ -511,15 +511,18 @@ public class DataEaseController extends Controller { /** * 省级管理员,帮助市州、县区填报数据,需要获取指定数据集的数据 * - * @param id 数据集id + * @param id 数据集id + * @param keyword 关键字 + * @param pageNumber 第几页 + * @param pageSize 每页显示多少条数据 */ @Before(GET.class) @IsLoginInterface({}) @IsNumericInterface({"id"}) - public void getDataSetContentByProvince(int id,String keyword, int pageNumber, int pageSize) { + public void getDataSetContentByProvince(int id, String keyword, int pageNumber, int pageSize) { if (pageNumber == 0) pageNumber = 1; if (pageSize == 0) pageSize = 20; - Page list = dm.getDataSetContentByProvince(id, keyword,pageNumber, pageSize); + Page list = dm.getDataSetContentByProvince(id, keyword, pageNumber, pageSize); renderJson(CommonUtil.renderJsonForLayUI(list)); }