From 1156a6e9619864201de922f4cfa93f6db989ff2e Mon Sep 17 00:00:00 2001
From: 1821349743@qq.com <1821349743@qq.com>
Date: 星期一, 17 四月 2023 12:09:07 +0800
Subject: [PATCH] report update
---
src/main/java/com/product/server/report/service/ListReportConfigServiceImple.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/product/server/report/service/ListReportConfigServiceImple.java b/src/main/java/com/product/server/report/service/ListReportConfigServiceImple.java
index c65054e..c7d3c5c 100644
--- a/src/main/java/com/product/server/report/service/ListReportConfigServiceImple.java
+++ b/src/main/java/com/product/server/report/service/ListReportConfigServiceImple.java
@@ -15,7 +15,7 @@
@Service
public class ListReportConfigServiceImple implements ListReportConfigService {
-
+
@Autowired
public BaseDao baseDao;
public BaseDao getBaseDao() {
@@ -25,7 +25,7 @@
this.baseDao = baseDao;
}
public ListReportServer reportServerNew;
-
+
public ListReportServer getReportServerNew() {
return reportServerNew;
}
@@ -81,7 +81,7 @@
}else{
showGroupField[i] = false;//鏄惁鍒嗙粍
}
- }
+ }
//鏄惁鍥哄畾琛ㄥご
if(felset.getString("fix_header").equals("1")){
rc.setFixHeader(true);
@@ -101,7 +101,7 @@
// }else{
// rc.setPage(false);
// }
- DataTableEntity headerData = baseDao.listTable("product_sys_report_header_properties", "report_uuid = '"+tableUuid+"'");
+ DataTableEntity headerData = baseDao.listTable("product_sys_report_header_properties", "report_uuid = '"+tableUuid+"'");
if(headerData.getRows() > 0){
int headerY = headerData.getRows() / fieldData.getRows();//浜岀淮鏁扮粍y
int[][] headerColspan = new int[headerY][fieldData.getRows()];//璺ㄥ垪
@@ -114,7 +114,7 @@
//鍒楀彂鐢熸敼鍙�
if(y != Integer.parseInt(header.getString("header_index").split("-")[1])){
y = Integer.parseInt(header.getString("header_index").split("-")[1]);
-
+
}
headerTitle[y][x] = header.getString("header_name");
headerColspan[y][x] = Integer.parseInt(header.getString("header_colspan"));
@@ -138,10 +138,10 @@
rc.setFormat(showFormat);//瀛楁鏍煎紡
rc.setGroupField(showGroupField);//鏄惁鍒嗙粍
}
-
+
System.out.println(data.getRows());
// rc.setCurrentPage(1);//褰撳墠椤�
-// rc.setTotalPage(data.getRows() / felset.getInteger("page_size"));//鎬婚〉鏁�
+// rc.setTotalCount(data.getRows() / felset.getInteger("page_size"));//鎬婚〉鏁�
// rc.setTotalRow(data.getRows());//鎬绘潯鏁�
rc.setDt(data);
System.out.println(rc.getDt().getRows());
--
Gitblit v1.9.2