From 57fa7477808604435f28ecc95f4b591f06b84292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Mon, 6 May 2024 14:40:56 +0800 Subject: [PATCH 1/2] 'commit' --- src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java b/src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java index 95dc4e25..b3aec4b6 100644 --- a/src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java +++ b/src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java @@ -337,13 +337,11 @@ public class ZbdcModel { Map m1 = new HashMap<>(); Map m2 = getSchoolNameMap(); - Map m3 = new HashMap<>(); Map m4 = getSchoolAreaName(); Map m5 = getSchoolTypeNameMap(); for (Record record : fillList) { m1.put(record.getStr("bureau_id") + "_" + record.getInt("templet_id"), record.getFloat("xysl")); - m3.put(record.getStr("bureau_id"), record.getStr("xzqh")); } //填充已填报的内容 @@ -351,7 +349,6 @@ public class ZbdcModel { record.set("area_name", m4.get(record.getStr("bureau_id"))); record.set("school_type_name", m5.get(record.getStr("bureau_id"))); record.set("bureau_name", m2.get(record.getStr("bureau_id"))); - record.set("xzqh", m3.get(record.getStr("bureau_id"))); if (m1.containsKey(record.getStr("bureau_id") + "_" + record.getInt("templet_id"))) { record.set("xysl", m1.get(record.getStr("bureau_id") + "_" + record.getInt("templet_id"))); } else { From dc06457adef5487238a806955cc2472b0870816c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Mon, 6 May 2024 14:41:10 +0800 Subject: [PATCH 2/2] 'commit' --- .../com/dsideal/QingLong/Zbdc/Controller/ZbdcController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/dsideal/QingLong/Zbdc/Controller/ZbdcController.java b/src/main/java/com/dsideal/QingLong/Zbdc/Controller/ZbdcController.java index 3a0b9773..23d2b74e 100644 --- a/src/main/java/com/dsideal/QingLong/Zbdc/Controller/ZbdcController.java +++ b/src/main/java/com/dsideal/QingLong/Zbdc/Controller/ZbdcController.java @@ -491,7 +491,7 @@ public class ZbdcController extends Controller { @Before({GET.class}) @IsLoginInterface({}) @EmptyInterface({"km_code"}) - // http://10.10.21.20:9000/QingLong/zbdc/getQueryYqsb?area_id=&school_type_id=211&keyword=&km_code=xxyl&level_filter=&year=0&page=1&limit=10 + // http://10.10.21.20:9000/QingLong/zbdc/getQueryYqsb?page=1&limit=15&area_id=&school_type_id=312&km_code=czyl&level_filter=&keyword= public void getQueryYqsb(String area_id, int school_type_id, String keyword, String km_code, String level_filter, int year, int page, int limit) { if (year == 0) year = DateTime.now().year();//如果没有传入获取的年份，那么就是系统的默认当前年份 String bureauIds = zm.getBureauIds(area_id, school_type_id, keyword);