From 128ff8ded421545340e52f09aed481c6700b81c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 14 Jun 2024 08:58:42 +0800
Subject: [PATCH] 'commit'

---
 .../QingLong/Zbdc/Model/ZbdcModel.java        | 32 ++++++++-----------
 修改记录.md                               | 10 +-----
 2 files changed, 14 insertions(+), 28 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 d0f47562..7aac12f4 100644
--- a/src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java
+++ b/src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java
@@ -111,29 +111,23 @@ public class ZbdcModel {
         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("xx_teacher_count", xx_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);
-        }
+        newRecord.set("xx_student_count", xx_student_count);
+        newRecord.set("xx_teacher_count", xx_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);
-        }
+        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("gz_zhuanren_count", gz_zhuanren_count);
-        }
+        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("gz_zhuanren_count", gz_zhuanren_count);
 
         //区县
         Map<String, Record> map = getSchoolAreaName();
diff --git a/修改记录.md b/修改记录.md
index 0eb376b4..37743a1c 100644
--- a/修改记录.md
+++ b/修改记录.md
@@ -6,12 +6,4 @@
 只有包含小学才有这个小学类型：城镇小学，村小，现修改为：城镇小学，中心小学
 ![](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标签页，
-同时提交时注意新增加的 专任教师栏目
\ No newline at end of file
+注意新增加的 专任教师栏目
\ No newline at end of file