Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

src/main/java/com/dsideal/QingLong/Zbdc/Controller/ZbdcController.java

@@ -308,7 +308,7 @@ public class ZbdcController extends Controller {
     public void getFill(int school_type_id, String keyword, String bureau_id, String km_code, String level_filter, int year, int page, int limit) {
         if (year == 0) year = DateTime.now().year();//如果没有传入获取的年份，那么就是系统的默认当前年份
         if (StrKit.isBlank(bureau_id)) {
-            SessionKit.get(getRequest(), getResponse(), "bureau_id");
+            bureau_id = SessionKit.get(getRequest(), getResponse(), "bureau_id");
         }
         String bureauIds = "'" + bureau_id + "'";
         Page<Record> list = zm.getFill(bureauIds, year, km_code, level_filter, page, limit);
@@ -661,13 +661,13 @@ public class ZbdcController extends Controller {
      */
 
     /**
-     张璐(市装备技术信息中心)
-     http://10.10.21.20:9000/QingLong/zbdc/listSchool?check_type_id=1&school_type_id=341&keyword=&page=1&limit=10
-
-     南关区教育局装备信息管理员
-     ngzbxxgly
-     123456
-     http://10.10.21.20:9000/QingLong/zbdc/listSchool?check_type_id=-1&school_type_id=0&keyword=&page=1&limit=10
+     * 张璐(市装备技术信息中心)
+     * http://10.10.21.20:9000/QingLong/zbdc/listSchool?check_type_id=1&school_type_id=341&keyword=&page=1&limit=10
+     * <p>
+     * 南关区教育局装备信息管理员
+     * ngzbxxgly
+     * 123456
+     * http://10.10.21.20:9000/QingLong/zbdc/listSchool?check_type_id=-1&school_type_id=0&keyword=&page=1&limit=10
      */
 
     @Before({GET.class})

src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java

@@ -39,7 +39,7 @@ public class ZbdcModel {
         String sql = "select * from t_zbdc_bureau_base where year=? and bureau_id=?";
         Record res = Db.findFirst(sql, year, bureau_id);
         if (res == null) {
-            sql = "select t1.org_name as bureau_name,t1.school_type_id,t2.school_type_name from t_base_organization as t1 inner join t_dm_schooltype as t2 on t1.school_type_id=t2.school_type_id where t1.org_id=?";
+            sql = "select t1.org_id as bureau_id,t1.org_name as bureau_name,t1.school_type_id,t2.school_type_name from t_base_organization as t1 inner join t_dm_schooltype as t2 on t1.school_type_id=t2.school_type_id where t1.org_id=?";
             res = Db.findFirst(sql, bureau_id);
         }
         return res;
@@ -336,7 +336,7 @@ public class ZbdcModel {
     /**
      * 功能：获取指定科目下的填报模板
      */
-    public Page<Record> getFill(String bureau_id, int year, String km_code, String level_filter, int page, int limit) {
+    public Page<Record> getFill(String bureau_ids, int year, String km_code, String level_filter, int page, int limit) {
         String c = "";
         if (!StrKit.isBlank(level_filter)) {
             String[] s = level_filter.split(",");
@@ -345,14 +345,14 @@ public class ZbdcModel {
             }
         }
 
-        String sqlExceptSelect = "from t_zbdc_templet where km_code='" + km_code + "'";
-        if (!StrKit.isBlank(c)) sqlExceptSelect += c;
-        sqlExceptSelect += " order by templet_id";
-        Page<Record> list = Db.paginate(page, limit, "select *", sqlExceptSelect);
+        String sql = "from t_zbdc_templet where km_code='" + km_code + "'";
+        if (!StrKit.isBlank(c)) sql += c;
+        sql += " order by templet_id";
+        Page<Record> list = Db.paginate(page, limit, "select *", sql);
 
         //获取此单位已填报的内容
-        String sql = "select templet_id,bureau_id,xysl,update_ts from t_zbdc_fill where year=? and bureau_id=?";
-        List<Record> fillList = Db.find(sql, year, bureau_id);
+        sql = "select templet_id,bureau_id,xysl,update_ts from t_zbdc_fill where year=? and bureau_id in ("+bureau_ids+")";
+        List<Record> fillList = Db.find(sql, year);
         Map<Integer, Float> _map = new HashMap<>();
         for (Record record : fillList) {
             _map.put(record.getInt("templet_id"), record.getFloat("xysl"));