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

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

@@ -287,7 +287,8 @@ public class ZbdcController extends Controller {
                          int gz_lsjtrshshu, float gz_lsjtrmj, int gz_hjddjzsks, int gz_hjddwjzsks,
                          int gz_hjddjzgnqshu, int gz_hjddwjzgnqshu,
                          String xx_ldjy, String cz_ldjy //小学劳动教育，初中劳动教育
-            , String xx_ldjy_values, String cz_ldjy_values
+            , String xx_ldjy_values, String cz_ldjy_values,
+                         String xx_ck, String cz_ck
     ) {
         if (year == 0) year = DateTime.now().year();//如果没有传入获取的年份，那么就是系统的默认当前年份
         String bureau_id = SessionKit.get(getRequest(), getResponse(), "bureau_id");
@@ -521,7 +522,8 @@ public class ZbdcController extends Controller {
                 xx_kx, xx_yq, xx_ms,
                 cz_wl, cz_hx, cz_sw, cz_yq, cz_ms,
                 gz_wl, gz_hx, gz_sw, gz_yq, gz_ms,
-                xx_ldjy, cz_ldjy,xx_ldjy_values,cz_ldjy_values
+                xx_ldjy, cz_ldjy, xx_ldjy_values, cz_ldjy_values,
+                xx_ck,cz_ck
         );
         Kv kv = Kv.create();
         kv.set("success", true);

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

@@ -310,7 +310,8 @@ public class ZbdcModel {
                          String cz_wl, String cz_hx, String cz_sw, String cz_yq, String cz_ms,
                          String gz_wl, String gz_hx, String gz_sw, String gz_yq, String gz_ms,
                          String xx_ldjy, String cz_ldjy,
-                         String xx_ldjy_values, String cz_ldjy_values
+                         String xx_ldjy_values, String cz_ldjy_values,
+                         String xx_ck,String cz_ck
     ) {
         String sql = "select * from t_zbdc_bureau_cgzb where year=? and bureau_id=?";
         Record record = Db.findFirst(sql, year, bureau_id);
@@ -384,9 +385,8 @@ public class ZbdcModel {
             r.set("xx_hjddwjzgnqshu", xx_hjddwjzgnqshu); // 小学护眼灯未改造功能室数量
 
             r.set("xx_ldjy", xx_ldjy);//小学劳动教育
-
             r.set("xx_ldjy_values", xx_ldjy_values);
-
+            r.set("xx_ck",xx_ck);// 小学创客
         }
 
         if (stage_id == 5) {
@@ -479,7 +479,8 @@ public class ZbdcModel {
             r.set("cz_hjddjzgnqshu", cz_hjddjzgnqshu); // 初中护眼灯已改造功能室数量
             r.set("cz_hjddwjzgnqshu", cz_hjddwjzgnqshu); // 初中护眼灯未改造功能室数量
             r.set("cz_ldjy", cz_ldjy);//初中劳动教育
-            r.set("cz_ldjy_values", cz_ldjy_values);
+            r.set("cz_ldjy_values", cz_ldjy_values);//初中劳动教育的每个SELECT下拉框默认值
+            r.set("cz_ck",cz_ck);// 初中创客
         }
 
         if (stage_id == 6) {
@@ -877,7 +878,8 @@ public class ZbdcModel {
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0,
                     null, null, null, null, null,
-                    null, null, null, null, null, null, null, null, null, null, null, null);
+                    null, null, null, null, null,
+                    null, null, null, null, null, null, null,null,null);
         }
 
         sql = "select km_code,km_name from t_zbdc_templet where templet_id=?";