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

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

@@ -1498,7 +1498,6 @@ public class ZbdcModel {
         return p;
     }
 
-
     /**
      * 功能：常规装备查询
      */
@@ -1510,20 +1509,20 @@ public class ZbdcModel {
             if (!StrKit.isBlank(area_id)) {
                 String bureauIds = getBureauIds(area_id, school_type_id, keyword);
                 if (StrKit.isBlank(bureauIds)) {
-                    p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_cgzb where 1=2");
+                    p = Db.paginate(page, limit, "select *,(xx_ldjy_qt_sum+cz_ldjy_qt_sum) as summary_ldjy_qt_sum", "from t_zbdc_bureau_cgzb where 1=2");
                 } else {
-                    p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_cgzb where bureau_id in (" + bureauIds + ") and year=" + year + " order by bureau_id");
+                    p = Db.paginate(page, limit, "select *,(xx_ldjy_qt_sum+cz_ldjy_qt_sum) as summary_ldjy_qt_sum", "from t_zbdc_bureau_cgzb where bureau_id in (" + bureauIds + ") and year=" + year + " order by bureau_id");
                 }
             } else {
                 if (school_type_id > 0) {
                     String school_type_name = getSchoolTypeName(school_type_id);
-                    p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_cgzb where year=" + year + " and school_type_name='" + school_type_name + "' and bureau_name like '%" + keyword + "%'  order by bureau_id");
+                    p = Db.paginate(page, limit, "select *,(xx_ldjy_qt_sum+cz_ldjy_qt_sum) as summary_ldjy_qt_sum", "from t_zbdc_bureau_cgzb where year=" + year + " and school_type_name='" + school_type_name + "' and bureau_name like '%" + keyword + "%'  order by bureau_id");
                 } else {
-                    p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_cgzb where year=" + year + " and bureau_name like '%" + keyword + "%'  order by bureau_id");
+                    p = Db.paginate(page, limit, "select *,(xx_ldjy_qt_sum+cz_ldjy_qt_sum) as summary_ldjy_qt_sum", "from t_zbdc_bureau_cgzb where year=" + year + " and bureau_name like '%" + keyword + "%'  order by bureau_id");
                 }
             }
         } else {
-            p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_cgzb where year=" + year + " and bureau_id='" + bureau_id + "'");
+            p = Db.paginate(page, limit, "select *,(xx_ldjy_qt_sum+cz_ldjy_qt_sum) as summary_ldjy_qt_sum", "from t_zbdc_bureau_cgzb where year=" + year + " and bureau_id='" + bureau_id + "'");
         }
 
         //配备情况
@@ -2840,6 +2839,7 @@ public class ZbdcModel {
     /**
      * 功能：劳动教育保存
      *
+     * @param xdkm      xx_ldjy cz_ldjy gz_ldjy
      * @param html
      * @param year
      * @param bureau_id
@@ -2860,7 +2860,7 @@ public class ZbdcModel {
         Elements elements = body.getAllElements().getFirst().getElementsByTag("input");
         List<Record> writeList = new ArrayList<>();
         String lx_name = "";
-        int js;
+        int js, sum_js = 0;
         for (int i = 0; i < elements.size(); i += 3) {
             Element input = elements.get(i);
             if (input.attr("value").trim().endsWith("其他")) {
@@ -2870,6 +2870,7 @@ public class ZbdcModel {
                 String v3 = input3.attr("value");
                 lx_name = v2;
                 js = Integer.parseInt(v3);
+                sum_js += js;
             } else {
                 Element input3 = elements.get(i + 2);
                 String v3 = input3.attr("value");
@@ -2890,5 +2891,9 @@ public class ZbdcModel {
             writeList.add(r);
         }
         Db.batchSave("t_zbdc_bureau_cgzb_detail", writeList, 100);
+        //sum_js中记录了保存到劳动教育其它栏目中的间数总和,需要update更新到主表上去
+        String col_name = xdkm + "_qt_sum";
+        sql = "update t_zbdc_bureau_cgzb set " + col_name + "=? where year=? and bureau_id=?";
+        Db.update(sql, sum_js, year, bureau_id);
     }
 }