From 560e61f5348aa726a19edd1ab380c84938cabd49 Mon Sep 17 00:00:00 2001
From: zhijie <1003392067@qq.com>
Date: 星期三, 15 十一月 2023 23:23:45 +0800
Subject: [PATCH] 新增perfomance参数
---
src/main/java/com/ots/project/tool/report/LAQ/LAQTemplate.java | 3 +++
src/main/java/com/ots/project/tool/report/LAQ/chart/LAQChart.java | 39 ++++++++++++++++++++++++++++++++-------
2 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ots/project/tool/report/LAQ/LAQTemplate.java b/src/main/java/com/ots/project/tool/report/LAQ/LAQTemplate.java
index f363622..3f8544e 100644
--- a/src/main/java/com/ots/project/tool/report/LAQ/LAQTemplate.java
+++ b/src/main/java/com/ots/project/tool/report/LAQ/LAQTemplate.java
@@ -57,4 +57,7 @@
@Excel(name = "EMOSTA")
private BigDecimal emosta;
+
+ @Excel(name = "Perfomance")
+ private BigDecimal perfomance;
}
\ No newline at end of file
diff --git a/src/main/java/com/ots/project/tool/report/LAQ/chart/LAQChart.java b/src/main/java/com/ots/project/tool/report/LAQ/chart/LAQChart.java
index 962ca37..4ff2859 100644
--- a/src/main/java/com/ots/project/tool/report/LAQ/chart/LAQChart.java
+++ b/src/main/java/com/ots/project/tool/report/LAQ/chart/LAQChart.java
@@ -48,7 +48,7 @@
public static void main(String[] args) throws Exception {
-/* String dataPath = "D:\\娴嬭瘎绯荤粺\\闇�姹俓\2023\\5.棰嗗娼滃姏鎶ュ憡\\report\\LAQ琛ㄥご鏁版嵁鏂囦欢.xlsx";
+ /*String dataPath = "D:\\娴嬭瘎绯荤粺\\闇�姹俓\LAQ\\report\\LAQ琛ㄥご鏁版嵁鏂囦欢.xlsx";
// 鑾峰彇瀵煎叆鏁版嵁
File file = new File(dataPath);
InputStream in = new FileInputStream(file);
@@ -60,10 +60,22 @@
for (int i = 0; i < laqTemplateList.size(); i++) {
LAQTemplate laqTemplate = laqTemplateList.get(i);
//缁勮鎶ュ憡鎵�鐢ㄦ暟鎹�
- Map<String, String> textMap = new HashMap<>();
- textMap.put("sendEmailFileName",laqTemplate.getName());
- textMap.put("nowDate", DateUtils.getDate());
- MapDataUtil.objectToMap(laqTemplate,textMap);
+ Map<String, Object> textMap = new HashMap<>();
+// textMap.put("sendEmailFileName",laqTemplate.getName());
+// textMap.put("nowDate", DateUtils.getDate());
+// MapDataUtil.objectToMap(laqTemplate,textMap);
+ textMap.put("olas","50");
+ textMap.put("ca","32");
+ textMap.put("bla","34");
+ textMap.put("nr","3");
+ textMap.put("ar","45");
+ textMap.put("open","67");
+ textMap.put("cons","12");
+ textMap.put("extra","48");
+ textMap.put("agree","90");
+ textMap.put("emosta","23");
+ textMap.put("perfomance","80");
+
LAQReport report = new LAQReport();
// ReportResultData resultData = report.getTemplateParameters(textMap, ReportTypeEnum.LAQ, LangTypeEnum.codeOf("English"));
@@ -71,7 +83,7 @@
// String zipFileName = WordUtil.makeReportFile("D:\\娴嬭瘎绯荤粺\\闇�姹俓\LAQ\\report\\LAQ鑻辨枃鎶ュ憡-20230926.docx", template, textMap, new HashMap<>(), deleteStrList);
// fileNameList.add(zipFileName);
ZipSecureFile.setMinInflateRatio(0.001);
- try (OutputStream os = new FileOutputStream("D:\\娴嬭瘎绯荤粺\\闇�姹俓\2023\\5.棰嗗娼滃姏鎶ュ憡\\report\\LAQ缂栬瘧鎶ュ憡.docx");XWPFDocument document = new XWPFDocument(POIXMLDocument.openPackage("D:\\娴嬭瘎绯荤粺\\闇�姹俓\2023\\5.棰嗗娼滃姏鎶ュ憡\\report\\LAQ涓枃妯℃澘.docx"))){
+ try (OutputStream os = new FileOutputStream("D:\\娴嬭瘎绯荤粺\\闇�姹俓\LAQ\\report\\LAQ鑻辨枃妯℃澘-wzp-淇敼鐗�-1.docx");XWPFDocument document = new XWPFDocument(POIXMLDocument.openPackage("D:\\娴嬭瘎绯荤粺\\闇�姹俓\LAQ\\report\\LAQ鑻辨枃妯℃澘-wzp-淇敼鐗�.docx"))){
Map<Integer,List<SeriesData>> seriesDatas = initData(textMap);
changeChart(document,seriesDatas,textMap);
document.write(os);
@@ -112,6 +124,7 @@
Double extra = Double.valueOf((String)textMap.get("extra"));
Double agree = Double.valueOf((String)textMap.get("agree"));
Double emosta = Double.valueOf((String)textMap.get("emosta"));
+ Double perfomance = Double.valueOf((String)textMap.get("perfomance"));
// 鍥捐〃1
List<SeriesData> seriesDatas = Arrays.asList(
@@ -267,6 +280,17 @@
);
seriesDataMap.put(10,seriesDatas);
+ // 鍥捐〃11
+ seriesDatas = Arrays.asList(
+ new SeriesData("X 鍊�", Arrays.asList(
+ new RowData("X 鍊�", olas.doubleValue())
+ )),
+ new SeriesData("Y 鍊�", Arrays.asList(
+ new RowData("Y 鍊�", perfomance.doubleValue())
+ ))
+ );
+ seriesDataMap.put(11,seriesDatas);
+
return seriesDataMap;
}
@@ -318,7 +342,7 @@
//鏁ｇ偣鍥�
if (!plot.getScatterChartList().isEmpty()) {
- List<SeriesData> seriesDatas = seriesDataMap.get(10);
+ List<SeriesData> seriesDatas = seriesDataMap.get(barIndex);
CTScatterChart scatterChart = plot.getScatterChartArray(0);
//System.out.println("鏁ｇ偣鍥緖"+plot.getScatterChartList().size()+"}");
//鍒锋柊鍐呯疆excel鏁版嵁
@@ -335,6 +359,7 @@
updateScatterChart(seriesDatas, ser.getXVal(), ser.getYVal());
++i;
}
+ barIndex++;
}
}
}
--
Gitblit v1.9.1