报表

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportAppVo.java

@@ -136,5 +136,7 @@ public class DailyReportAppVo {
     private ParameterVo row106;
     private ParameterVo row107;
 
+    private int totalRowspan;
+
 
 }

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java

@@ -1338,6 +1338,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
             dynamicRows.add(parameterVo);
         }
         dailyReportAppVo.setDynamicRows(dynamicRows);
+        int totalRowspan = 3;
         if (!dynamicRows.isEmpty()) {
             for (int i = 0; i < dynamicRows.size(); i++) {
                 if (i > 6) {
@@ -1348,36 +1349,43 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
                         case 0:
                             if (parameterVo != null) {
                                 dailyReportAppVo.setRow101(parameterVo);
+                                totalRowspan = totalRowspan+1;
                             }
                             break;
                         case 1:
                             if (parameterVo != null) {
                                 dailyReportAppVo.setRow102(parameterVo);
+                                totalRowspan = totalRowspan+1;
                             }
                             break;
                         case 2:
                             if (parameterVo != null) {
                                 dailyReportAppVo.setRow103(parameterVo);
+                                totalRowspan = totalRowspan+1;
                             }
                             break;
                         case 3:
                             if (parameterVo != null) {
                                 dailyReportAppVo.setRow104(parameterVo);
+                                totalRowspan = totalRowspan+1;
                             }
                             break;
                         case 4:
                             if (parameterVo != null) {
                                 dailyReportAppVo.setRow105(parameterVo);
+                                totalRowspan = totalRowspan+1;
                             }
                             break;
                         case 5:
                             if (parameterVo != null) {
                                 dailyReportAppVo.setRow106(parameterVo);
+                                totalRowspan = totalRowspan+1;
                             }
                             break;
                         case 6:
                             if (parameterVo != null) {
                                 dailyReportAppVo.setRow107(parameterVo);
+                                totalRowspan = totalRowspan+1;
                             }
                             break;
                         default:
@@ -1386,6 +1394,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
                 }
             }
         }
+        dailyReportAppVo.setTotalRowspan(totalRowspan);
         return rb.success().setData(dailyReportAppVo);
     }
 }