From 2ee84dc5f2e8bfd86391685e3708f08da66586c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Thu, 25 Jul 2024 13:42:58 +0800
Subject: [PATCH] 'commit'

---
 .../com/dsideal/QingLong/Zbdc/Controller/ZbdcController.java | 3 ++-
 src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

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 8cfab78d..c9af0d73 100644
--- a/src/main/java/com/dsideal/QingLong/Zbdc/Controller/ZbdcController.java
+++ b/src/main/java/com/dsideal/QingLong/Zbdc/Controller/ZbdcController.java
@@ -287,6 +287,7 @@ 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
     ) {
         if (year == 0) year = DateTime.now().year();//如果没有传入获取的年份，那么就是系统的默认当前年份
         String bureau_id = SessionKit.get(getRequest(), getResponse(), "bureau_id");
@@ -520,7 +521,7 @@ 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, cz_ldjy,xx_ldjy_values,cz_ldjy_values
         );
         Kv kv = Kv.create();
         kv.set("success", true);
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 12ce5f02..470a63c7 100644
--- a/src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java
+++ b/src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java
@@ -309,7 +309,8 @@ public class ZbdcModel {
                          String xx_kx, String xx_yq, String xx_ms,
                          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, String cz_ldjy,
+                         String xx_ldjy_values, String cz_ldjy_values
     ) {
         String sql = "select * from t_zbdc_bureau_cgzb where year=? and bureau_id=?";
         Record record = Db.findFirst(sql, year, bureau_id);
@@ -586,6 +587,8 @@ public class ZbdcModel {
 
         r.set("xx_ldjy", xx_ldjy);//小学劳动教育
         r.set("cz_ldjy", cz_ldjy);//初中劳动教育
+        r.set("xx_ldjy_values",xx_ldjy_values);
+        r.set("cz_ldjy_values",cz_ldjy_values);
 
         if (record == null) {
             Db.save("t_zbdc_bureau_cgzb", "year,bureau_id", r);