|
@ -1065,6 +1065,10 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da |
|
|
rows1.removeAll(Collections.singleton(null)); |
|
|
rows1.removeAll(Collections.singleton(null)); |
|
|
dailyReportAppVo.setRow1(rows1); |
|
|
dailyReportAppVo.setRow1(rows1); |
|
|
List<String> brandList = rows1.stream().map(v -> v.getLinkSid()).collect(Collectors.toList()); |
|
|
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<DailyReportVo> dailyReportVoList = baseMapper.selectReport4(brandList, useOrgSid, date); |
|
|
//燃料
|
|
|
//燃料
|
|
|
List<String> row2 = dailyReportVoList.stream().map(v -> v.getFuelTypeValue()).collect(Collectors.toList()); |
|
|
List<String> row2 = dailyReportVoList.stream().map(v -> v.getFuelTypeValue()).collect(Collectors.toList()); |
|
@ -1334,6 +1338,54 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da |
|
|
dynamicRows.add(parameterVo); |
|
|
dynamicRows.add(parameterVo); |
|
|
} |
|
|
} |
|
|
dailyReportAppVo.setDynamicRows(dynamicRows); |
|
|
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); |
|
|
return rb.success().setData(dailyReportAppVo); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|