报表建表语句修改

DBScript/张艳杰/001-DDL.sql

@@ -411,7 +411,6 @@ SDATE                   VARCHAR(8)     comment '起始数据日期',
 EDATE                   VARCHAR(8)     comment '截止数据日期',
 TERM                    VARCHAR(8)     comment '年月',
 DATA_DATE               VARCHAR(8)     comment '数据日期',
-ID                      VARCHAR(60)    comment '序号',
 REPORT_NO               VARCHAR(60)    comment '报表编号',
 REPORT_UNIT_NO          VARCHAR(60)    comment '报表计算单元编号',
 REPORT_UNIT_SHEET       DECIMAL(30,0)  comment 'sheet页位置',

Procedure/backend/project/src/main/java/com/sundata/product/rwa/reportformconfigreportcreater/mybatis/ReportFillingConfigMapper.xml

@@ -245,7 +245,6 @@
         EDATE                   AS   endDate,
         TERM                    AS   term,
         DATA_DATE               AS   dataDate,
-        ID                      AS   id,
         REPORT_NO               AS   reportno,
         REPORT_UNIT_NO          AS   reportUnitNo,
         REPORT_UNIT_SHEET       AS   reportUnitSheet,

Procedure/backend/project/src/main/java/com/sundata/product/rwa/reportformconfigreportcreater/service/ReportFillingConfigService.java

@@ -110,14 +110,16 @@ public class ReportFillingConfigService {
     }
 
     public void createCalcReportData(List<ReportCalculationModel> modelList,String reportNo) {
-        for(ReportCalculationModel model:modelList) {
-            if (null == model.getExcelFormula()) {
-                model.setExcelFormula("ROW()&\"-\"&COLUMN()");
-                model.setReportno(reportNo);
-                model.setReportUnitNo(reportNo+model.getReportUnitSheet()
-                        +model.getReportUnitRow()+model.getReportUnitCell());
+        if (null != modelList && modelList.size() > 0) {
+            for(ReportCalculationModel model:modelList) {
+                if (null == model.getExcelFormula()) {
+                    model.setExcelFormula("ROW()&\"-\"&COLUMN()");
+                    model.setReportno(reportNo);
+                    model.setReportUnitNo(reportNo+model.getReportUnitSheet()
+                            +model.getReportUnitRow()+model.getReportUnitCell());
+                }
+                reportFillingConfigMapper.createCalcReportData(model);
             }
-            reportFillingConfigMapper.createCalcReportData(model);
         }
     }