From 2473842b28b8d3651d2023624588ad7f28d11d42 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 20 Dec 2023 11:09:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=AA=E6=98=BE=E7=A4=BA7=E4=B8=AA?=
 =?UTF-8?q?=E5=89=A9=E4=BD=99=E7=9C=81=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/dailyreport/DailyReportAppVo.java     |  9 +++
 .../biz/dailyreport/DailyReportService.java   | 64 +++++++++++++++++--
 2 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportAppVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportAppVo.java
index 0b1b9f8d07..6efdcdcd6e 100644
--- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportAppVo.java
+++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportAppVo.java
@@ -127,4 +127,13 @@ public class DailyReportAppVo {
     private boolean rightBtn2;
     private boolean rightBtn3;*/
 
+    private ParameterVo row101;
+    private ParameterVo row102;
+    private ParameterVo row103;
+    private ParameterVo row104;
+    private ParameterVo row105;
+    private ParameterVo row106;
+    private ParameterVo row107;
+
+
 }
diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java
index ea09449bb8..b759a25da7 100644
--- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java
+++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java
@@ -576,7 +576,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
     public ResultBean<DailyReportAppVo> list2(String date) {
         ResultBean<DailyReportAppVo> rb = ResultBean.fireFail();
         DailyReportAppVo dailyReportAppVo = new DailyReportAppVo();
-        dailyReportAppVo.setTitle("集团（事业部）"+date+"日报");
+        dailyReportAppVo.setTitle("集团（事业部）" + date + "日报");
         List<BrandVo> rows1 = baseMapper.list2(date);
         rows1.removeAll(Collections.singleton(null));
         dailyReportAppVo.setRow1(rows1);
@@ -819,7 +819,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         ResultBean<DailyReportAppVo> rb = ResultBean.fireFail();
         DailyReportAppVo dailyReportAppVo = new DailyReportAppVo();
         List<BrandVo> rows1 = baseMapper.list3(date, busOrgSid);
-        dailyReportAppVo.setTitle("事业部（分公司）"+date+"日报");
+        dailyReportAppVo.setTitle("事业部（分公司）" + date + "日报");
         rows1.removeAll(Collections.singleton(null));
         dailyReportAppVo.setRow1(rows1);
         List<DailyReportVo> dailyReportVoList = baseMapper.selectReport3(date, busOrgSid);
@@ -1060,11 +1060,15 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
     public ResultBean<DailyReportAppVo> list4(String date, String useOrgSid) {
         ResultBean<DailyReportAppVo> rb = ResultBean.fireFail();
         DailyReportAppVo dailyReportAppVo = new DailyReportAppVo();
-        dailyReportAppVo.setTitle("分公司"+date+"日报");
+        dailyReportAppVo.setTitle("分公司" + date + "日报");
         List<BrandVo> rows1 = baseMapper.selectByBrand2(useOrgSid, date);
         rows1.removeAll(Collections.singleton(null));
         dailyReportAppVo.setRow1(rows1);
         List<String> brandList = rows1.stream().map(v -> v.getLinkSid()).collect(Collectors.toList());
+        brandList.removeAll(Collections.singleton(null));
+        if(brandList.isEmpty()){
+            return rb.success();
+        }
         List<DailyReportVo> dailyReportVoList = baseMapper.selectReport4(brandList, useOrgSid, date);
         //燃料
         List<String> row2 = dailyReportVoList.stream().map(v -> v.getFuelTypeValue()).collect(Collectors.toList());
@@ -1314,7 +1318,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
             ParameterVo parameterVo = new ParameterVo();
             parameterVo.setName(dailyParameterVo.getColText());
 
-            List<String> columnNames = dailyReportVoList.stream().map(v-> {
+            List<String> columnNames = dailyReportVoList.stream().map(v -> {
                 String columnName = "";
                 try {
                     Field field = v.getClass().getDeclaredField(dailyParameterVo.getColName());
@@ -1323,9 +1327,9 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
                 } catch (NoSuchFieldException | IllegalAccessException e) {
                     e.printStackTrace();
                 }
-                if(StringUtils.isBlank(columnName)){
+                if (StringUtils.isBlank(columnName)) {
                     return "-";
-                }else{
+                } else {
                     return columnName;
                 }
             }).collect(Collectors.toList());
@@ -1334,6 +1338,54 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
             dynamicRows.add(parameterVo);
         }
         dailyReportAppVo.setDynamicRows(dynamicRows);
+        if (!dynamicRows.isEmpty()) {
+            for (int i = 0; i < dynamicRows.size(); i++) {
+                if (i > 6) {
+                    break;
+                } else {
+                    ParameterVo parameterVo = dynamicRows.get(i);
+                    switch (i) {
+                        case 0:
+                            if (parameterVo != null) {
+                                dailyReportAppVo.setRow101(parameterVo);
+                            }
+                            break;
+                        case 1:
+                            if (parameterVo != null) {
+                                dailyReportAppVo.setRow102(parameterVo);
+                            }
+                            break;
+                        case 2:
+                            if (parameterVo != null) {
+                                dailyReportAppVo.setRow103(parameterVo);
+                            }
+                            break;
+                        case 3:
+                            if (parameterVo != null) {
+                                dailyReportAppVo.setRow104(parameterVo);
+                            }
+                            break;
+                        case 4:
+                            if (parameterVo != null) {
+                                dailyReportAppVo.setRow105(parameterVo);
+                            }
+                            break;
+                        case 5:
+                            if (parameterVo != null) {
+                                dailyReportAppVo.setRow106(parameterVo);
+                            }
+                            break;
+                        case 6:
+                            if (parameterVo != null) {
+                                dailyReportAppVo.setRow107(parameterVo);
+                            }
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
+        }
         return rb.success().setData(dailyReportAppVo);
     }
 }