From a94115e809beab1c78616ee34557b734cff46ece Mon Sep 17 00:00:00 2001
From: zhijie <1003392067@qq.com>
Date: 星期二, 15 三月 2022 00:19:32 +0800
Subject: [PATCH] 增加JAQ自定义公式支持
---
src/main/java/com/ots/project/tool/report/JAQ/condition/Table4.java | 2
src/main/java/com/ots/common/utils/poi/WordUtil.java | 104 +++++++++++++++++++++++++++++++---
src/main/java/com/ots/project/tool/report/JAQ/condition/Table1.java | 2
src/main/java/com/ots/common/enums/TableEnum.java | 37 ++++++++++++
src/main/java/com/ots/project/tool/report/JAQ/condition/Table3.java | 12 ++-
src/main/java/com/ots/project/tool/report/JAQ/condition/Table2.java | 12 ++-
src/main/java/com/ots/project/tool/report/reportCalculation/response/ReportAPIResult.java | 8 --
7 files changed, 152 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/ots/common/enums/TableEnum.java b/src/main/java/com/ots/common/enums/TableEnum.java
new file mode 100644
index 0000000..cce71b1
--- /dev/null
+++ b/src/main/java/com/ots/common/enums/TableEnum.java
@@ -0,0 +1,37 @@
+package com.ots.common.enums;
+
+import lombok.Getter;
+
+import java.util.Objects;
+
+/**
+ * @version 1.0
+ * @Author linzhijie
+ * @Description //TODO
+ * @Date 2022/03/11 16:25
+ */
+@Getter
+public enum TableEnum {
+ table1(0,"琛�1"),
+ table2(1,"琛�2"),
+ table3(2,"琛�3"),
+ table4(4,"琛�4"),
+ table4Children(5,"琛�4瀛愰泦鍚�");
+
+ private Integer code;
+ private String name;
+
+ TableEnum(Integer code,String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static TableEnum codeOf(Integer code) {
+ for (TableEnum xxxEnum : values()) {
+ if (Objects.equals(xxxEnum.getCode(), code)) {
+ return xxxEnum;
+ }
+ }
+ throw new RuntimeException("The table is not supported!");
+ }
+}
diff --git a/src/main/java/com/ots/common/utils/poi/WordUtil.java b/src/main/java/com/ots/common/utils/poi/WordUtil.java
index b859c5f..0b4e491 100644
--- a/src/main/java/com/ots/common/utils/poi/WordUtil.java
+++ b/src/main/java/com/ots/common/utils/poi/WordUtil.java
@@ -1,7 +1,10 @@
package com.ots.common.utils.poi;
import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.ots.common.enums.ReportTypeEnum;
import com.ots.common.enums.ReportTypeNameEnum;
+import com.ots.common.enums.TableEnum;
import com.ots.common.enums.TemplateTypeEnum;
import com.ots.common.utils.StringUtils;
import com.ots.framework.config.EssConfig;
@@ -14,12 +17,7 @@
import com.ots.project.tool.exam.ExamUtil;
import com.ots.project.tool.exam.ImageUtil;
import com.ots.project.tool.exam.ZipUtil;
-import com.ots.project.tool.report.JAQ.condition.Table1;
-import com.ots.project.tool.report.JAQ.condition.Table2;
-import com.ots.project.tool.report.JAQ.condition.Table3;
-import com.ots.project.tool.report.JAQ.condition.Table4;
import com.ots.project.tool.report.PAQ.chart.PAQChart;
-import com.ots.project.tool.report.SAQ.chart.SAQChart;
import org.apache.commons.collections.map.HashedMap;
import org.apache.poi.ooxml.POIXMLDocument;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -294,6 +292,13 @@
List<XWPFTable> tables = document.getTables();
setTableValue(document, textMap, tables);
}
+
+ /**
+ * 璁剧疆琛ㄦ牸鍊�
+ * @param document
+ * @param textMap
+ * @param tables
+ */
private static void setTableValue(XWPFDocument document, Map<String, Object> textMap, List<XWPFTable> tables) {
for (int i = 0; i < tables.size(); i++) {
@@ -301,8 +306,10 @@
try {
XWPFTable table = tables.get(i);
if (table.getRows().size() > 0) {
-
+ log.info("琛ㄨ鏁�:{}",table.getRows().size());
log.info("琛ㄦ牸鏁版嵁锛�" + table.getText());
+
+ addOrDelTableRow(table,i,textMap);
if (checkText(table.getText())) {
List<XWPFTableRow> rows = table.getRows();
@@ -314,6 +321,63 @@
}
}
}
+
+ /**
+ * 澧炲姞琛ㄦ牸鎴栬�呮笡灏戣〃鏍�
+ * @param table 琛ㄦ牸
+ * @param index 琛ㄧ储寮�
+ * @param textMap 璧嬪�煎璞�
+ */
+ private static void addOrDelTableRow(XWPFTable table, int index, Map<String, Object> textMap) {
+
+ try {
+ TableEnum tableEnum = TableEnum.codeOf(index);
+ Integer tableNum = Integer.valueOf(textMap.get(tableEnum.getName()).toString());
+ Integer rows = table.getRows().size();
+ Integer contentRows = table.getRows().size() - 1;
+ //闄愬埗琛屾暟涓嶄负绌� 鍜� 闄愬埗琛屾暟璺熸姤鍛婄幇鏈変笉涓�鑷撮渶杩涜澶勭悊
+ if(tableNum != null && !tableNum.equals(contentRows)){
+
+ if(tableNum > contentRows){
+ //澧炲姞琛屾暟
+ Integer addRow = tableNum - contentRows;
+ log.info("{}澧炲姞{}琛屾暟",tableEnum.getName(),addRow);
+ for (int i = rows; i < rows+addRow; i++) {
+ log.info("澧炲姞{}琛�",i);
+ addJAQTable(table,tableEnum,i);
+ }
+ }else{
+ //鍑忓皯琛屾暟
+ Integer delRow = tableNum - rows;
+ log.info("{}鍑忓皯{}琛屾暟",TableEnum.codeOf(index).getName(),delRow);
+ }
+
+ }
+
+ }catch (Exception e){
+ e.printStackTrace();
+ log.info("琛▄}澧炲姞琛ㄦ牸鎴栬�呮笡灏戣〃鏍煎紓甯�",index+1);
+ }
+ }
+
+ /**
+ * 娣诲姞JAQ琛ㄦ牸
+ * @param tableEnum
+ * @param index
+ */
+ private static void addJAQTable(XWPFTable table,TableEnum tableEnum,Integer index){
+ switch (tableEnum){
+ case table1:
+ break;
+ case table2:
+ break;
+ case table3:
+ break;
+ case table4:
+ break;
+ }
+ }
+
private static void addTableValue(XWPFDocument document, Map<Integer, Map<Integer, List<String[]>>> autoTableMap) {
if (Objects.isNull(autoTableMap)) {
@@ -338,7 +402,7 @@
}
}
}
- private static void setTableMap(Map<String, Object> tableMap, Map<Integer, List<String[]>> mapRowsMap) {
+ /* private static void setTableMap(Map<String, Object> tableMap, Map<Integer, List<String[]>> mapRowsMap) {
if (Objects.isNull(tableMap) || tableMap.isEmpty()) {
return;
}
@@ -370,7 +434,7 @@
table4List.add(t.toRow());
}
mapRowsMap.put(3, table4List);
- }
+ }*/
public static void eachTable(List<XWPFTableRow> rows, Map<String, Object> textMap, XWPFDocument document) throws IOException, org.apache.poi.openxml4j.exceptions.InvalidFormatException {
for (XWPFTableRow row : rows) {
@@ -1293,8 +1357,30 @@
public static void main(String[] args) {
- if (!checkText("浜烘墠閫夋嫈鐨勭洰鐨勫氨鏄壘鍒拌兘澶熻儨浠诲伐浣溿�佹効鎰忔壙鎷呭伐浣滐紝涓斾笌缁勭粐鐨勯渶姹傘�佹枃鍖栥�佷环鍊艰鐩稿尮閰嶇殑浜恒�侾AQ鎶ュ憡鏄牴鎹�欓�変汉瀵筆AQ闂嵎涓鐩殑浣滅瓟淇℃伅鑰岀敓鎴愮殑锛屾祴閲忕殑鏄�欓�変汉鍦ㄥ伐浣滀腑鍋忓ソ鐨勮涓洪鏍笺�侾AQ涔熷寘鎷簡瀵逛綔绛旂湡瀹炴�х殑娴嬮噺锛屽悓鏃朵篃瑁呭叆浜員AI涓撴湁鐨勪綔鍋囬槻鑼冪▼搴忥紝鍙互鏈夋晥闄嶄綆鍊欓�変汉鐨勪吉瑁呭ソ鍊惧悜锛堝叏鐞�30%鐨勮嚜璇勯棶鍗蜂腑閮藉嚭鐜颁簡浼濂界幇璞★級銆�")) {
+/* if (!checkText("浜烘墠閫夋嫈鐨勭洰鐨勫氨鏄壘鍒拌兘澶熻儨浠诲伐浣溿�佹効鎰忔壙鎷呭伐浣滐紝涓斾笌缁勭粐鐨勯渶姹傘�佹枃鍖栥�佷环鍊艰鐩稿尮閰嶇殑浜恒�侾AQ鎶ュ憡鏄牴鎹�欓�変汉瀵筆AQ闂嵎涓鐩殑浣滅瓟淇℃伅鑰岀敓鎴愮殑锛屾祴閲忕殑鏄�欓�変汉鍦ㄥ伐浣滀腑鍋忓ソ鐨勮涓洪鏍笺�侾AQ涔熷寘鎷簡瀵逛綔绛旂湡瀹炴�х殑娴嬮噺锛屽悓鏃朵篃瑁呭叆浜員AI涓撴湁鐨勪綔鍋囬槻鑼冪▼搴忥紝鍙互鏈夋晥闄嶄綆鍊欓�変汉鐨勪吉瑁呭ソ鍊惧悜锛堝叏鐞�30%鐨勮嚜璇勯棶鍗蜂腑閮藉嚭鐜颁簡浼濂界幇璞★級銆�")) {
System.out.println("11");
+ }*/
+
+ try {
+ InputStream is = new FileInputStream("C:\\Users\\datou\\Desktop\\JAQ涓枃鐗�.docx");
+ XWPFDocument document = new XWPFDocument(is);
+
+ String result = "{\"T3Line21C\":\"1\",\"T4com8item1\":\"JAQ0127\",\"T1com8IF_H\":\"12.92\",\"T4com8item3\":\"JAQ0046\",\"T4com8item2\":\"JAQ0108\",\"T1com8IF_L\":\"12.16\",\"T1com8IF_M\":\"12.54\",\"T3item2\":\"JAQ0092\",\"T2com1I_L\":\"3.80\",\"T3item3\":\"JAQ0019\",\"T3item4\":\"JAQ0027\",\"T3item5\":\"JAQ0021\",\"T3item6\":\"JAQ0044\",\"T3item7\":\"JAQ0045\",\"T2Com13I_M\":\"3.40\",\"T3item8\":\"JAQ0105\",\"T3item9\":\"JAQ0002\",\"T2com1I_H\":\"4.20\",\"T3item3IF_M\":\"18.00\",\"T3Line10C\":\"0\",\"T3Line22C\":\"0\",\"T1com15IF_H\":\"15.20\",\"T1com15IF_L\":\"7.28\",\"T3Line9C\":\"0\",\"T1com1IF_M\":\"15.62\",\"T1com15IF_M\":\"11.24\",\"T1com1IF_L\":\"14.44\",\"T2com6I_L\":\"3.60\",\"T1com1IF_H\":\"16.80\",\"T1com4IF_M\":\"14.78\",\"T1com4IF_L\":\"14.44\",\"T3Line11C\":\"0\",\"T2com6I_H\":\"4.00\",\"T1com4IF_H\":\"15.12\",\"T3item16IF_M\":\"16.00\",\"T3com18\":\"23. 婵�鍔变粬浜篭",\"T4com6item1\":\"JAQ0049\",\"T3com17\":\"11. 瀹㈡埛瀵煎悜锛堝唴閮ㄥ拰澶栭儴锛塡",\"T4com6item3\":\"JAQ0135\",\"T3com19\":\"14. 鍒ゆ柇鍜屽喅绛朶",\"T4com6item2\":\"JAQ0025\",\"T3Line8C\":\"0\",\"T3com10\":\"20. 鎺堟潈\",\"T3item13IF_M\":\"16.00\",\"T3com12\":\"19. 浜哄憳閰嶇疆涓庝汉鎵嶅煿鍏籠",\"T3com11\":\"1. 閫傚簲鎬у拰鍙橀潻绠＄悊\",\"T3com14\":\"15. 璁″垝鍜岀粍缁嘰",\"T3Line23C\":\"0\",\"T3com13\":\"20. 鎺堟潈\",\"T3com16\":\"23. 婵�鍔变粬浜篭",\"T3com15\":\"18. 绠＄悊浠栦汉\",\"T1com11IF_L\":\"10.88\",\"T1com11IF_M\":\"11.90\",\"T1com11IF_H\":\"12.92\",\"T2com14I_H\":\"3.40\",\"T2com1\":\"1. 閫傚簲鎬у拰鍙橀潻绠＄悊\",\"T2com2\":\"20. 鎺堟潈\",\"T3Line6C\":\"0\",\"T2com9\":\"6. 鍘嬪姏蹇嶅彈-鎯呯华闊ф�",\"T2com7\":\"15. 璁″垝鍜岀粍缁嘰",\"T2com8\":\"19. 浜哄憳閰嶇疆涓庝汉鎵嶅煿鍏籠",\"T2com5\":\"5. 缂滃瘑鎬",\"T3item7IF_M\":\"18.00\",\"T3Line7C\":\"0\",\"T2com6\":\"9. 鍚岀悊蹇僜",\"T2Com14I_M\":\"3.40\",\"T3item24IF_M\":\"16.00\",\"T2com3\":\"23. 婵�鍔变粬浜篭",\"T2Com5I_M\":\"3.80\",\"T2com4\":\"11. 瀹㈡埛瀵煎悜锛堝唴閮ㄥ拰澶栭儴锛塡",\"T2com14I_L\":\"3.40\",\"T3Line12C\":\"0\",\"T3Line24C\":\"1\",\"T2com15I_H\":\"3.80\",\"T2com15I_L\":\"2.60\",\"T1com4\":\"1. 閫傚簲鎬у拰鍙橀潻绠＄悊\",\"T4com2item2\":\"JAQ0089\",\"T1com5\":\"9. 鍚岀悊蹇僜",\"T4com2item3\":\"JAQ0129\",\"T1com6\":\"5. 缂滃瘑鎬",\"T1com7\":\"8. 鍥㈤槦鍗忎綔\",\"T4com2item1\":\"JAQ0105\",\"T1com8\":\"19. 浜哄憳閰嶇疆涓庝汉鎵嶅煿鍏籠",\"T1com9\":\"6. 鍘嬪姏蹇嶅彈-鎯呯华闊ф�",\"T2Com6I_M\":\"3.80\",\"T1com1\":\"23. 婵�鍔变粬浜篭",\"T1com2\":\"20. 鎺堟潈\",\"T1com3\":\"11. 瀹㈡埛瀵煎悜锛堝唴閮ㄥ拰澶栭儴锛塡",\"T2Line9C\":\"0\",\"T1com7IF_H\":\"17.60\",\"T2com5I_H\":\"4.00\",\"T1com7IF_M\":\"12.70\",\"T3Line13C\":\"0\",\"T1com7IF_L\":\"7.80\",\"T3Line25C\":\"0\",\"T2com5I_L\":\"3.60\",\"T1com2IF_M\":\"15.56\",\"T1com2IF_L\":\"14.40\",\"T1com2IF_H\":\"16.72\",\"琛�4瀛愰泦鍚圽":\"3\",\"T2rank1\":\"1\",\"T3item4IF_M\":\"18.00\",\"T3item27IF_M\":\"16.00\",\"T2rank3\":\"3\",\"T3com21\":\"12. 鍒嗘瀽鍜屾壒鍒ゆ�ф�濈淮\",\"T2rank2\":\"2\",\"T3com20\":\"5. 缂滃瘑鎬",\"T2rank5\":\"5\",\"T3com23\":\"6. 鍘嬪姏蹇嶅彈-鎯呯华闊ф�",\"T2rank4\":\"4\",\"T3com22\":\"3. 涓诲姩鎬",\"T2rank7\":\"7\",\"T3com25\":\"11. 瀹㈡埛瀵煎悜锛堝唴閮ㄥ拰澶栭儴锛塡",\"T2rank6\":\"6\",\"T3com24\":\"2. 瀛︿範鏁忛攼搴",\"T2rank9\":\"9\",\"T3Line14C\":\"0\",\"T3com27\":\"20. 鎺堟潈\",\"T2rank8\":\"8\",\"T3com26\":\"1. 閫傚簲鎬у拰鍙橀潻绠＄悊\",\"T3Line26C\":\"0\",\"T3item23IF_M\":\"16.00\",\"T3item27\":\"JAQ0076\",\"T3item26\":\"JAQ0113\",\"T3item25\":\"JAQ0107\",\"T3item24\":\"JAQ0065\",\"T3item23\":\"JAQ0064\",\"T1rank9\":\"9\",\"T3item22\":\"JAQ0068\",\"T3item21\":\"JAQ0052\",\"T3item20\":\"JAQ0049\",\"T1rank6\":\"6\",\"T1com3IF_M\":\"14.88\",\"T1rank5\":\"5\",\"T1com3IF_L\":\"12.96\",\"T1rank8\":\"8\",\"T1rank7\":\"7\",\"T1rank2\":\"2\",\"T1rank1\":\"1\",\"T2Com15I_M\":\"3.20\",\"T1rank4\":\"4\",\"T1rank3\":\"3\",\"T3Line27C\":\"0\",\"琛�1\":\"15\",\"琛�2\":\"15\",\"琛�3\":\"27\",\"琛�4\":\"10\",\"T1com3IF_H\":\"16.80\",\"T3Line15C\":\"1\",\"T4com1item3\":\"JAQ0023\",\"T3item8IF_M\":\"18.00\",\"T3item17IF_M\":\"16.00\",\"T4com7item3\":\"JAQ0003\",\"T3item19\":\"JAQ0033\",\"T3item18\":\"JAQ0023\",\"T4com7item1\":\"JAQ0001\",\"T3item12IF_M\":\"16.00\",\"T3item17\":\"JAQ0020\",\"T4com7item2\":\"JAQ0042\",\"T3item16\":\"JAQ0133\",\"T3item15\":\"JAQ0012\",\"T1com12IF_M\":\"11.58\",\"T3item14\":\"JAQ0131\",\"T3item13\":\"JAQ0129\",\"T3item12\":\"JAQ0127\",\"T3item11\":\"JAQ0006\",\"T3item10\":\"JAQ0089\",\"T4com10\":\"24. 缁勭粐鏁忛攼搴",\"T3item1\":\"JAQ0128\",\"T1com12IF_H\":\"12.96\",\"T1com12IF_L\":\"10.20\",\"T2Com10I_M\":\"3.50\",\"T2com10I_H\":\"4.40\",\"T3Line16C\":\"0\",\"T2Com1I_M\":\"4.00\",\"T2com4I_H\":\"4.20\",\"T2com10I_L\":\"2.60\",\"T4com1item2\":\"JAQ0133\",\"T2com4I_L\":\"3.60\",\"T4com1item1\":\"JAQ0019\",\"T1com13IF_H\":\"12.92\",\"T2Line4C\":\"0\",\"T3item5IF_M\":\"18.00\",\"T2com11I_H\":\"3.60\",\"T3Line1C\":\"0\",\"T4com9item3\":\"JAQ0114\",\"T4rank10\":\"10\",\"T1com13IF_L\":\"10.20\",\"T1com13IF_M\":\"11.56\",\"T3Line17C\":\"0\",\"T2Com2I_M\":\"4.00\",\"T2com11I_L\":\"3.40\",\"T2com9I_L\":\"3.00\",\"T4com9item1\":\"JAQ0064\",\"T4com9item2\":\"JAQ0050\",\"T2com9I_H\":\"4.00\",\"T2Line5C\":\"0\",\"T3item26IF_M\":\"16.00\",\"T4com10item3\":\"JAQ0079\",\"T2Com7I_M\":\"3.60\",\"T2Line6C\":\"0\",\"T3Line18C\":\"0\",\"T2com12\":\"24. 缁勭粐鏁忛攼搴",\"T2com13\":\"16. 鍒涢�犳�",\"T2com14\":\"25. 鍟嗕笟涓庢垬鐣ユ晱閿愬害\",\"T2Line11C\":\"0\",\"T2com15\":\"3. 涓诲姩鎬",\"T3rank27\":\"27\",\"T2com10\":\"8. 鍥㈤槦鍗忎綔\",\"T2com11\":\"14. 鍒ゆ柇鍜屽喅绛朶",\"T4com5item3\":\"JAQ0097\",\"T4com5item1\":\"JAQ0044\",\"T4com5item2\":\"JAQ0004\",\"T4com3\":\"11. 瀹㈡埛瀵煎悜锛堝唴閮ㄥ拰澶栭儴锛塡",\"T4com4\":\"1. 閫傚簲鎬у拰鍙橀潻绠＄悊\",\"T4com1\":\"23. 婵�鍔变粬浜篭",\"T3item9IF_M\":\"18.00\",\"T3item22IF_M\":\"16.00\",\"T4com2\":\"20. 鎺堟潈\",\"T4com7\":\"8. 鍥㈤槦鍗忎綔\",\"T3item2IF_M\":\"18.00\",\"T4com8\":\"19. 浜哄憳閰嶇疆涓庝汉鎵嶅煿鍏籠",\"T4com5\":\"9. 鍚岀悊蹇僜",\"T2Com8I_M\":\"3.60\",\"T2Com11I_M\":\"3.50\",\"T4com6\":\"5. 缂滃瘑鎬",\"T2com3I_H\":\"4.20\",\"T3rank22\":\"22\",\"T3rank21\":\"21\",\"T3rank20\":\"20\",\"T4com9\":\"6. 鍘嬪姏蹇嶅彈-鎯呯华闊ф�",\"T2Line7C\":\"0\",\"T3Line19C\":\"0\",\"T2com3I_L\":\"3.80\",\"T3rank26\":\"26\",\"T3rank25\":\"25\",\"T3rank24\":\"24\",\"T3rank23\":\"23\",\"T2Line10C\":\"0\",\"T1com6IF_M\":\"13.00\",\"T1com6IF_L\":\"10.80\",\"T3item18IF_M\":\"16.00\",\"T1com6IF_H\":\"15.20\",\"T3item11IF_M\":\"16.00\",\"T2Line8C\":\"0\",\"T2com8I_L\":\"3.40\",\"T1com9IF_M\":\"12.10\",\"T3rank1\":\"1\",\"T2com8I_H\":\"3.80\",\"T3rank2\":\"2\",\"T3item10IF_M\":\"18.00\",\"T1com14IF_M\":\"11.40\",\"T1com14IF_L\":\"8.40\",\"T3rank9\":\"9\",\"T3Line5C\":\"0\",\"T3rank7\":\"7\",\"T3rank8\":\"8\",\"T3rank5\":\"5\",\"T3rank6\":\"6\",\"T3rank3\":\"3\",\"T3rank4\":\"4\",\"T4rank7\":\"7\",\"T4rank6\":\"6\",\"T4rank5\":\"5\",\"T4rank4\":\"4\",\"T4com3item3\":\"JAQ0107\",\"T4com3item2\":\"JAQ0020\",\"T4rank9\":\"9\",\"T4com3item1\":\"JAQ0045\",\"T4rank8\":\"8\",\"T3item6IF_M\":\"18.00\",\"T1com14IF_H\":\"14.40\",\"T4rank3\":\"3\",\"T2Line13C\":\"0\",\"T4rank2\":\"2\",\"T4rank1\":\"1\",\"T3rank19\":\"19\",\"T2Line1C\":\"0\",\"T3rank18\":\"18\",\"T2Line12C\":\"0\",\"T3rank17\":\"17\",\"T3rank16\":\"16\",\"T2com12I_H\":\"4.00\",\"T3Line4C\":\"0\",\"T3item20IF_M\":\"16.00\",\"T2Com12I_M\":\"3.50\",\"T2Com3I_M\":\"4.00\",\"T3item14IF_M\":\"16.00\",\"T3rank11\":\"11\",\"T3rank10\":\"10\",\"T2com2I_H\":\"4.40\",\"T1com9IF_H\":\"15.20\",\"T2com12I_L\":\"3.00\",\"T3rank15\":\"15\",\"T3rank14\":\"14\",\"T2com2I_L\":\"3.60\",\"T3rank13\":\"13\",\"T1com9IF_L\":\"9.00\",\"T3rank12\":\"12\",\"T2rank14\":\"14\",\"T2rank13\":\"13\",\"T2rank15\":\"15\",\"T2rank10\":\"10\",\"T2com13I_H\":\"4.00\",\"T3item15IF_M\":\"16.00\",\"T2Line2C\":\"0\",\"T2rank12\":\"12\",\"T2rank11\":\"11\",\"T3Line3C\":\"0\",\"T1com10IF_M\":\"12.10\",\"T1com10IF_L\":\"9.00\",\"T2Com4I_M\":\"3.90\",\"T4com10item2\":\"JAQ0014\",\"T1com10IF_H\":\"15.20\",\"T4com10item1\":\"JAQ0027\",\"T2com13I_L\":\"2.80\",\"T3item25IF_M\":\"16.00\",\"T3item1IF_M\":\"18.00\",\"T3item21IF_M\":\"16.00\",\"T2com7I_L\":\"3.40\",\"T2Line15C\":\"1\",\"T3com6\":\"9. 鍚岀悊蹇僜",\"T3com7\":\"11. 瀹㈡埛瀵煎悜锛堝唴閮ㄥ拰澶栭儴锛塡",\"T3Line20C\":\"0\",\"T2com7I_H\":\"3.80\",\"T3com8\":\"20. 鎺堟潈\",\"T3com9\":\"15. 璁″垝鍜岀粍缁嘰",\"T3com2\":\"16. 鍒涢�犳�",\"T3com3\":\"23. 婵�鍔变粬浜篭",\"T3com4\":\"24. 缁勭粐鏁忛攼搴",\"T2Line3C\":\"0\",\"T3com5\":\"1. 閫傚簲鎬у拰鍙橀潻绠＄悊\",\"T1rank15\":\"15\",\"T1rank14\":\"14\",\"T1rank13\":\"13\",\"T1rank12\":\"12\",\"T1rank11\":\"11\",\"T1rank10\":\"10\",\"T3Line2C\":\"0\",\"T1com5IF_H\":\"15.20\",\"T1com10\":\"24. 缁勭粐鏁忛攼搴",\"T1com11\":\"25. 鍟嗕笟涓庢垬鐣ユ晱閿愬害\",\"T2Com9I_M\":\"3.50\",\"T1com12\":\"14. 鍒ゆ柇鍜屽喅绛朶",\"T1com13\":\"15. 璁″垝鍜岀粍缁嘰",\"T1com14\":\"16. 鍒涢�犳�",\"T1com15\":\"26. 姝ｇ洿銆佷俊浠诲拰鍏俊鍔沑",\"T3item19IF_M\":\"16.00\",\"T1com5IF_M\":\"13.72\",\"T3com1\":\"1. 閫傚簲鎬у拰鍙橀潻绠＄悊\",\"T4com4item1\":\"JAQ0128\",\"T1com5IF_L\":\"12.24\",\"T2Line14C\":\"0\",\"T4com4item2\":\"JAQ0021\",\"T4com4item3\":\"JAQ0006\"}";
+
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ //json瀵硅薄杞琈ap
+ Map<String,Object> textMap = jsonObject;
+
+ //鏇存敼琛ㄦ牸鐨勫��
+ changeTable(document, textMap);
+
+ //寤虹珛鏂囦欢瀵硅薄
+ File file = new File("C:\\Users\\datou\\Desktop\\JAQ涓枃鐗�1.docx");
+ FileOutputStream out = new FileOutputStream(file);
+ document.write(out);
+ out.flush();
+ }catch (Exception e){
+ e.printStackTrace();
}
}
}
diff --git a/src/main/java/com/ots/project/tool/report/JAQ/condition/Table1.java b/src/main/java/com/ots/project/tool/report/JAQ/condition/Table1.java
index c4b0fb9..b186ba7 100644
--- a/src/main/java/com/ots/project/tool/report/JAQ/condition/Table1.java
+++ b/src/main/java/com/ots/project/tool/report/JAQ/condition/Table1.java
@@ -1,3 +1,4 @@
+/*
package com.ots.project.tool.report.JAQ.condition;
import lombok.Getter;
import lombok.Setter;
@@ -18,3 +19,4 @@
return new String[]{rank, competency, average, range};
}
}
+*/
diff --git a/src/main/java/com/ots/project/tool/report/JAQ/condition/Table2.java b/src/main/java/com/ots/project/tool/report/JAQ/condition/Table2.java
index fcc6649..1959851 100644
--- a/src/main/java/com/ots/project/tool/report/JAQ/condition/Table2.java
+++ b/src/main/java/com/ots/project/tool/report/JAQ/condition/Table2.java
@@ -1,20 +1,22 @@
+/*
package com.ots.project.tool.report.JAQ.condition;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class Table2 {
-
+
private String rank;
-
+
private String competency;
-
+
private String average;
-
+
private String range;
-
+
private boolean whetherToMarkItInOchreRed;
public String[] toRow() {
return new String[]{rank, competency, average, range};
}
}
+*/
diff --git a/src/main/java/com/ots/project/tool/report/JAQ/condition/Table3.java b/src/main/java/com/ots/project/tool/report/JAQ/condition/Table3.java
index 8433f25..5ab9274 100644
--- a/src/main/java/com/ots/project/tool/report/JAQ/condition/Table3.java
+++ b/src/main/java/com/ots/project/tool/report/JAQ/condition/Table3.java
@@ -1,20 +1,22 @@
+/*
package com.ots.project.tool.report.JAQ.condition;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class Table3 {
-
+
private String rank;
-
+
private String behavior;
-
+
private String importanceFrequency;
-
+
private String competency;
-
+
private boolean whetherToMarkItInOchreRed;
public String[] toRow() {
return new String[]{rank, behavior, importanceFrequency, competency};
}
}
+*/
diff --git a/src/main/java/com/ots/project/tool/report/JAQ/condition/Table4.java b/src/main/java/com/ots/project/tool/report/JAQ/condition/Table4.java
index 1fbb9f9..e882162 100644
--- a/src/main/java/com/ots/project/tool/report/JAQ/condition/Table4.java
+++ b/src/main/java/com/ots/project/tool/report/JAQ/condition/Table4.java
@@ -1,3 +1,4 @@
+/*
package com.ots.project.tool.report.JAQ.condition;
import lombok.Getter;
import lombok.Setter;
@@ -20,3 +21,4 @@
return new String[]{competency, stringBuffer.toString()};
}
}
+*/
diff --git a/src/main/java/com/ots/project/tool/report/reportCalculation/response/ReportAPIResult.java b/src/main/java/com/ots/project/tool/report/reportCalculation/response/ReportAPIResult.java
index afa0553..9cf5839 100644
--- a/src/main/java/com/ots/project/tool/report/reportCalculation/response/ReportAPIResult.java
+++ b/src/main/java/com/ots/project/tool/report/reportCalculation/response/ReportAPIResult.java
@@ -1,8 +1,4 @@
package com.ots.project.tool.report.reportCalculation.response;
-import com.ots.project.tool.report.JAQ.condition.Table1;
-import com.ots.project.tool.report.JAQ.condition.Table2;
-import com.ots.project.tool.report.JAQ.condition.Table3;
-import com.ots.project.tool.report.JAQ.condition.Table4;
import com.ots.project.tool.report.reportCalculation.request.HolderInfo;
import lombok.Getter;
import lombok.Setter;
@@ -22,8 +18,8 @@
private Map data;
- private List<Table1> table1;
+/* private List<Table1> table1;
private List<Table2> table2;
private List<Table3> table3;
- private List<Table4> table4;
+ private List<Table4> table4;*/
}
--
Gitblit v1.9.1