'commit'

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

@@ -57,13 +57,17 @@ public class ZbdcController extends Controller {
      * @param xx_class_count    小学班级数
      * @param cz_class_count    初中班级数
      * @param gz_class_count    高中班级数
-     * @param xiaoxue_type_id  0：默认值       1：城镇小学       2：村小
+     * @param xiaoxue_type_id   0：默认值       1：城镇小学       2：中心小学
+     * @param xx_zhuanren_count 小学部专任教师数量
+     * @param cz_zhuanren_count 初中部专任教师数量
+     * @param gz_zhuanren_count 高中部专任教师数量
      */
     @Before({POST.class})
     @IsLoginInterface({})
     public void saveSchool(int year, int xx_student_count, int cz_student_count, int gz_student_count,
                            int xx_teacher_count, int cz_teacher_count, int gz_teacher_count,
-                           int xx_class_count, int cz_class_count, int gz_class_count, int xiaoxue_type_id) {
+                           int xx_class_count, int cz_class_count, int gz_class_count, int xiaoxue_type_id,
+                           int xx_zhuanren_count, int cz_zhuanren_count, int gz_zhuanren_count) {
         if (year == 0) year = DateTime.now().year();//如果没有传入获取的年份，那么就是系统的默认当前年份
         String bureau_id = SessionKit.get(getRequest(), getResponse(), "bureau_id");
         //获取学校的学校名称等信息
@@ -74,7 +78,7 @@ public class ZbdcController extends Controller {
         zm.saveSchool(year, bureau_id, bureau_name, school_type_name, xx_student_count, cz_student_count,
                 gz_student_count, xx_teacher_count, cz_teacher_count,
                 gz_teacher_count, xx_class_count,
-                cz_class_count, gz_class_count, xiaoxue_type_id);
+                cz_class_count, gz_class_count, xiaoxue_type_id, xx_zhuanren_count, cz_zhuanren_count, gz_zhuanren_count);
         Kv kv = Kv.create();
         kv.set("success", true);
         kv.set("message", "保存成功!");
@@ -297,7 +301,7 @@ public class ZbdcController extends Controller {
             bureau_id = SessionKit.get(getRequest(), getResponse(), "bureau_id");
         }
         String bureauIds = "'" + bureau_id + "'";
-        Page<Record> list = zm.getFill(bureauIds, year, km_code, level_filter,pbyq, page, limit);
+        Page<Record> list = zm.getFill(bureauIds, year, km_code, level_filter, pbyq, page, limit);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 
@@ -501,10 +505,10 @@ public class ZbdcController extends Controller {
     @IsLoginInterface({})
     @EmptyInterface({"km_code"})
     // 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 type_id, int pbyq,int page, int limit) {
+    public void getQueryYqsb(String area_id, int school_type_id, String keyword, String km_code, String level_filter, int year, int type_id, int pbyq, int page, int limit) {
         if (year == 0) year = DateTime.now().year();//如果没有传入获取的年份，那么就是系统的默认当前年份
         String bureauIds = zm.getBureauIds(area_id, school_type_id, keyword);
-        Page<Record> list = zm.getQueryYqsb(bureauIds, year, km_code, level_filter, type_id,pbyq, page, limit);
+        Page<Record> list = zm.getQueryYqsb(bureauIds, year, km_code, level_filter, type_id, pbyq, page, limit);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 

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

@@ -73,8 +73,8 @@ public class ZbdcModel {
     /**
      * 功能：
      *
-     * @param bureau_id
+     * @param bureau_id 单位id
-     * @return
+     * @return 单位Bean
      */
     public Record getBureauBean(String bureau_id) {
         String sql = "select t1.org_id,t1.org_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 org_id=?";
@@ -93,11 +93,15 @@ public class ZbdcModel {
      * @param xx_class_count    小学班级数
      * @param cz_class_count    初中班级数
      * @param gz_class_count    高中班级数
+     * @param xx_zhuanren_count 小学部专任教师数量
+     * @param cz_zhuanren_count 初中部专任教师数量
+     * @param gz_zhuanren_count 高中部专任教师数量
      */
     public void saveSchool(int year, String bureau_id, String bureau_name, String school_type_name,
                            int xx_student_count, int cz_student_count, int gz_student_count,
                            int xx_teacher_count, int cz_teacher_count, int gz_teacher_count,
-                           int xx_class_count, int cz_class_count, int gz_class_count, int xiaoxue_type_id) {
+                           int xx_class_count, int cz_class_count, int gz_class_count, int xiaoxue_type_id,
+                           int xx_zhuanren_count, int cz_zhuanren_count, int gz_zhuanren_count) {
         String sql = "select * from t_zbdc_bureau_base where year=? and bureau_id=?";
         Record record = Db.findFirst(sql, year, bureau_id);
         Record newRecord = new Record();
@@ -105,16 +109,31 @@ public class ZbdcModel {
         newRecord.set("bureau_id", bureau_id);
         newRecord.set("bureau_name", bureau_name);
         newRecord.set("school_type_name", school_type_name);
+
+        //小学
+        if (xx_class_count > 0 || xx_student_count > 0 || xx_zhuanren_count > 0 || xx_teacher_count > 0) {
             newRecord.set("xx_student_count", xx_student_count);
-        newRecord.set("cz_student_count", cz_student_count);
-        newRecord.set("gz_student_count", gz_student_count);
             newRecord.set("xx_teacher_count", xx_teacher_count);
-        newRecord.set("cz_teacher_count", cz_teacher_count);
-        newRecord.set("gz_teacher_count", gz_teacher_count);
             newRecord.set("xx_class_count", xx_class_count);
+            newRecord.set("xiaoxue_type_id", xiaoxue_type_id);
+            newRecord.set("xx_zhuanren_count", xx_zhuanren_count);
+        }
+
+        //初中
+        if (cz_class_count > 0 || cz_student_count > 0 || cz_zhuanren_count > 0 || cz_teacher_count > 0) {
+            newRecord.set("cz_student_count", cz_student_count);
+            newRecord.set("cz_teacher_count", cz_teacher_count);
             newRecord.set("cz_class_count", cz_class_count);
+            newRecord.set("cz_zhuanren_count", cz_zhuanren_count);
+        }
+
+        //高中
+        if (gz_class_count > 0 || gz_student_count > 0 || gz_zhuanren_count > 0 || gz_teacher_count > 0) {
+            newRecord.set("gz_teacher_count", gz_teacher_count);
+            newRecord.set("gz_student_count", gz_student_count);
             newRecord.set("gz_class_count", gz_class_count);
-        newRecord.set("xiaoxue_type_id", xiaoxue_type_id);
+            newRecord.set("gz_zhuanren_count", gz_zhuanren_count);
+        }
 
         //区县
         Map<String, Record> map = getSchoolAreaName();

修改记录.md

@@ -0,0 +1,17 @@
+#### 基础信息修改
+原来
+![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202406140828087.png)
+现在
+![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202406140829699.png)
+只有包含小学才有这个小学类型：城镇小学，村小，现修改为：城镇小学，中心小学
+![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202406140831467.png)
+
+修改办法：
+1、将基础信息/QingLong/view/tb/zbdc/base.html页面一切为三：
+(1)base_xx.html
+(2)base_cz.html
+(3)base_gz.html
+
+如果学校只是小学，初中，高中，就只显示其中一个即可。
+如果是9年一贯制，或者是完全中学，需要在右侧区域上方添加tab标签页，
+同时提交时注意新增加的 专任教师栏目