|
@@ -173,7 +173,7 @@ public class ReportFillingConfigService {
|
|
|
|
|
|
/**
|
|
|
* @author: 张艳杰
|
|
|
- * @methodsName: selectCalcProcessType
|
|
|
+ * @methodsName: analyseReportFile
|
|
|
* @description: 解析报表
|
|
|
* @param : ReportDefinitionModel model,String key
|
|
|
* @return:
|
|
@@ -229,6 +229,33 @@ public class ReportFillingConfigService {
|
|
|
return model;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * @author: 张艳杰
|
|
|
+ * @methodsName: selectCalcReportData
|
|
|
+ * @description: 解析报表
|
|
|
+ * @param : String reportNo
|
|
|
+ * @return: Map<String,List<ReportCalculationModel>>
|
|
|
+ * @throws:
|
|
|
+ */
|
|
|
+ public Map<String,List<ReportCalculationModel>> selectCalcReportData(String reportNo) {
|
|
|
+ Map<String,List<ReportCalculationModel>> resMap = new HashMap<>();
|
|
|
+ List<ReportCalculationModel> modelFillInList = new ArrayList<ReportCalculationModel>();
|
|
|
+ List<ReportCalculationModel> modelCalcList = new ArrayList<ReportCalculationModel>();
|
|
|
+ List<ReportCalculationModel> listModel = reportFillingConfigMapper.selectCalcReportData(reportNo);
|
|
|
+ for(ReportCalculationModel model :listModel) {
|
|
|
+ if (model.getExcelFormula().equals(ReportFinalParam.EXECUTE_REPORT)) {
|
|
|
+ modelFillInList.add(model);
|
|
|
+ } else {
|
|
|
+ modelCalcList.add(model);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ resMap.put("FillIn",modelFillInList);
|
|
|
+ resMap.put("Calc",modelCalcList);
|
|
|
+ return resMap;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* @author: 张艳杰
|
|
|
* @methodsName: selectCalcProcessType
|