diff --git a/Doc/全省及州市县区人口与教育报告集20241023/133个县区报告2022/县区研究报告/怒江州各县区报告4/福贡县/~$贡县人口变化及其对教育的影响》(8)(1).docx b/Doc/全省及州市县区人口与教育报告集20241023/133个县区报告2022/县区研究报告/怒江州各县区报告4/福贡县/~$贡县人口变化及其对教育的影响》(8)(1).docx new file mode 100644 index 00000000..fcd42e3f Binary files /dev/null and b/Doc/全省及州市县区人口与教育报告集20241023/133个县区报告2022/县区研究报告/怒江州各县区报告4/福贡县/~$贡县人口变化及其对教育的影响》(8)(1).docx differ 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 c9901dba..25308492 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -387,13 +387,14 @@ public class DataEaseController extends Controller { * 市州管理员,帮助县区管理员填报数据,需要获取指定数据集的数据 * * @param id 数据集id + * @param keyword 关键字 * @param pageNumber 第几页 * @param pageSize 每页多少条数据 */ @Before(GET.class) @IsLoginInterface({}) @IsNumericInterface({"id"}) - public void getDataSetContentByCity(int id, 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; //登录的人员 @@ -405,7 +406,7 @@ public class DataEaseController extends Controller { //根据区域码,获取区域名称 String area_name = rm.getAreaName(area_code); - Page list = dm.getDataSetContentByCity(id, area_name, pageNumber, pageSize); + Page list = dm.getDataSetContentByCity(id,keyword, area_name, pageNumber, pageSize); renderJson(CommonUtil.renderJsonForLayUI(list)); } diff --git a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java index 11a954fa..aa3cd429 100644 --- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java +++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java @@ -606,12 +606,12 @@ public class DataEaseModel { * @param area_name * @return */ - public Page getDataSetContentByCity(int id, String area_name, int pageNumber, int pageSize) { + public Page getDataSetContentByCity(int id, String keyword, String area_name, int pageNumber, int pageSize) { Record record = Db.findById("t_dp_dataset", "id", id); String tableName = record.getStr("table_name"); Page p = Db.paginate(pageNumber, pageSize, - "SELECT *", "from " + DB_NAME + ".`" + tableName + "` where `上级行政区划`='" + area_name + "'"); + "SELECT *", "from " + DB_NAME + ".`" + tableName + "` where `上级行政区划`='" + area_name + "' and `行政区划` like `%"+keyword+"%`"); return p; }