report update

1821349743@qq.com

2023-04-17 1156a6e9619864201de922f4cfa93f6db989ff2e

 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());