报表

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

@@ -114,6 +114,8 @@ public class DailyReportAppVo {
     @ApiModelProperty("金融未放款金额")
     private List<String> row49 = new ArrayList<>();
 
+    private List<ParameterVo> dynamicRows = new ArrayList<>();
+
 
     private List<DailyReportVo> dailyReportVoList = new ArrayList<>();
 

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

@@ -158,8 +158,8 @@ public class DailyReportVo implements Vo {
     private String saddle;
     @ApiModelProperty("空调")
     private String airConditioner;
-    @ApiModelProperty("更多配置")
-    private String otherConfig;
+   /* @ApiModelProperty("更多配置")
+    private String otherConfig;*/
     @ApiModelProperty("速比")
     private String rearAxleRatio;
     @ApiModelProperty("后桥")
@@ -238,4 +238,6 @@ public class DailyReportVo implements Vo {
     @ApiModelProperty("规格型号")
     private String specifications;
 
+
+
 }

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

@@ -0,0 +1,18 @@
+package com.yxt.anrui.reportcenter.api.dailyreport;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/12/14
+ **/
+@Data
+public class ParameterVo {
+
+    private String name;
+    private List<String> row = new ArrayList<>();
+}

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

@@ -533,7 +533,52 @@
         ifnull(sum(dr.deliver_subtotal_year), 0)       as deliver_subtotal_year
                 ,
         bm.fuelTypeValue,
-        bm.emissionStandardValue
+        bm.emissionStandardValue,
+        bmc.carColor,
+        bmc.specification,
+        bmc.fuelTank,
+        bmc.baffleModel,
+        bmc.independentSources,
+        bmc.tireCover,
+        bmc.saddle,
+        bmc.airConditioner,
+        bmc.rearAxleRatio,
+        bmc.rearAxleValue,
+        bmc.tireSize,
+        bmc.slowMachine,
+        bmc.rearViewMirror,
+        bmc.wheelbase,
+        bmc.suspension,
+        bmc.packingCase,
+        bmc.seat,
+        bmc.hubMaterial,
+        bmc.configuringBao,
+        bmc.multimedia,
+        bmc.bumper,
+        bmc.clutchValue,
+        bmc.dirMachineValue,
+        bmc.proponsValue,
+        bmc.doorAndWindowValue,
+        bmc.doorLockValue,
+        bmc.headlightValue,
+        bmc.boardPedalValue,
+        bmc.steerWheelValue,
+        bmc.storagBatteryValue,
+        bmc.comfortPackValue,
+        bmc.cheBasePackValue,
+        bmc.savingPackValue,
+        bmc.conPackValue,
+        bm.vehicleTypeValue,
+        bm.emissionStandardValue,
+        bm.productLineValue,
+        bm.driveFormValue,
+        bm.powerValue,
+        bm.tranCaseTypeValue,
+        bm.gearboxTypeValue,
+        bm.fuelTypeValue,
+        bm.vehicleVersionValue,
+        bm.engineTypeValue,
+        bm.specifications
         from daily_report dr
                  left join anrui_base.base_vehicle_model bm on bm.sid = dr.vehModelSid
                  left join anrui_base.base_model_config bmc on bmc.sid = dr.vehMConfigSid

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

@@ -1303,6 +1303,36 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         BigDecimal row49All = row49.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
         row49.add(row49All.toString());
         dailyReportAppVo.setRow49(row49);
+        List<ParameterVo> dynamicRows = new ArrayList<>();
+
+
+        List<DailyParameterVo> parameterVoList = baseMapper.selectByParameters(useOrgSid);
+        parameterVoList.removeAll(Collections.singleton(null));
+        for (int i = 0; i < parameterVoList.size(); i++) {
+            DailyParameterVo dailyParameterVo = parameterVoList.get(i);
+            String tableName = Arrays.asList(dailyParameterVo.getTableNameKey().split("\\.")).get(1);
+            ParameterVo parameterVo = new ParameterVo();
+            parameterVo.setName(dailyParameterVo.getColText());
+
+            List<String> columnNames = dailyReportVoList.stream().map(v-> {
+                String columnName = "";
+                try {
+                    Field field = v.getClass().getDeclaredField(dailyParameterVo.getColName());
+                    field.setAccessible(true);
+                    columnName = (String) field.get(v);
+                } catch (NoSuchFieldException | IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+                if(StringUtils.isBlank(columnName)){
+                    return "-";
+                }else{
+                    return columnName;
+                }
+            }).collect(Collectors.toList());
+            parameterVo.setRow(columnNames);
+            dynamicRows.add(parameterVo);
+        }
+        dailyReportAppVo.setDynamicRows(dynamicRows);
         return rb.success().setData(dailyReportAppVo);
     }
 }