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

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

@@ -842,7 +842,7 @@ public class ZbdcController extends Controller {
     public void getSummaryCgzb(int year) {
         if (year == 0) year = DateTime.now().year();//如果没有传入获取的年份，那么就是系统的默认当前年份
         List<JSONObject> list = zm.getSummaryCgzb(year);
-        renderJson(list);
+        renderJson(CommonUtil.renderJsonForLayUI(CommonUtil.convertListJsonObjectToListRecord(list)));
     }
 
     @Before({GET.class})
@@ -1052,4 +1052,14 @@ public class ZbdcController extends Controller {
         kv.set("data", record);
         renderJson(kv);
     }
+
+    /**
+     * 功能：一键导出
+     *
+     * @param year
+     */
+    @IsLoginInterface({})
+    public void CheckOneKeyExportExcel(int year) {
+
+    }
 }