'commit'

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<Record> list = dm.getDataSetContentByCity(id, area_name, pageNumber, pageSize);
+        Page<Record> list = dm.getDataSetContentByCity(id,keyword, area_name, pageNumber, pageSize);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 

src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java

@@ -606,12 +606,12 @@ public class DataEaseModel {
      * @param area_name
      * @return
      */
-    public Page<Record> getDataSetContentByCity(int id, String area_name, int pageNumber, int pageSize) {
+    public Page<Record> 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<Record> 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;
     }