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

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

@@ -2275,7 +2275,7 @@ public class ZbdcModel {
             //2、指定年份
             //3、指定审核状态
             //4、report_level=2 只处理区域报上来的数据
-            String sql = "update t_zbdc_report set check_type_id=?,message=?,check_bureau_id=? where year=? and area_id=? and b_use=1 and report_level=2";
+            String sql = "update t_zbdc_report set check_type_id=?,message=?,check_bureau_id=?,update_ts=now() where year=? and area_id=? and b_use=1 and report_level=2";
             Db.update(sql, check_type_id, message, check_bureau_id, year, s);
         }
         for (String s : bureau_ids.split(",")) {

src/main/resource/Sql/Zbdc.sql

@@ -227,6 +227,7 @@
     WITH RankedRows AS (
     SELECT
         area_id,area_name,bureau_id,bureau_name,year,check_type_id,message,create_time,
+        (year||'年教育技术装备信息') as data_name,
         ROW_NUMBER() OVER (PARTITION BY  bureau_id,year ORDER BY year DESC) AS rn
     FROM t_zbdc_report where bureau_id=#para(bureau_id)
     )