From 57b0763e8031011832a1929934f3db28426dbb4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 12 Jan 2024 09:19:18 +0800 Subject: [PATCH] 'commit' --- .../067195d0-15f9-46d9-918b-a92924059622.xlsx | Bin 0 -> 8823 bytes .../7bee4cc2-1b6e-4e64-99cf-44685705461d.xlsx | Bin 0 -> 8823 bytes .../QingLong/Collect/Model/CollectModel.java | 27 +++++++++++------- 3 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 WebRoot/Excel/067195d0-15f9-46d9-918b-a92924059622.xlsx create mode 100644 WebRoot/Excel/7bee4cc2-1b6e-4e64-99cf-44685705461d.xlsx diff --git a/WebRoot/Excel/067195d0-15f9-46d9-918b-a92924059622.xlsx b/WebRoot/Excel/067195d0-15f9-46d9-918b-a92924059622.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..02fadf770e1961c1bf3cc15b2dc757a59c652052 GIT binary patch literal 8823 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 bbpK*zWh9`V>I2Y!8BoArL2_#NPv8CrUhyX2 literal 0 HcmV?d00001 diff --git a/WebRoot/Excel/7bee4cc2-1b6e-4e64-99cf-44685705461d.xlsx b/WebRoot/Excel/7bee4cc2-1b6e-4e64-99cf-44685705461d.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..02fadf770e1961c1bf3cc15b2dc757a59c652052 GIT binary patch literal 8823 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 bbpK*zWh9`V>I2Y!8BoArL2_#NPv8CrUhyX2 literal 0 HcmV?d00001 diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java index f7acf30c..91700aff 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java @@ -605,7 +605,7 @@ public class CollectModel { String column_name, original_name; for (int colNum = 0; colNum < ed.getLastCellNum(); colNum++) { - if (StrKit.isBlank(ed.getCell(colNum).toString())) { + if (StrKit.isBlank(ed.getCell(colNum).toString())) {//下面没有,应该听上面的 original_name = CommonUtil.removeKuoHao(st.getCell(colNum).toString().replace("\n", "")); column_name = ChineseCharacterUtil.getColumnNameByMemo(CommonUtil.removeKuoHao(st.getCell(colNum).toString())); Record record = new Record(); @@ -613,12 +613,19 @@ public class CollectModel { record.set("column_name", column_name); list.add(record); } else { - int k = colNum; + int k = colNum;//如果最后一列有值 while (StrKit.isBlank(st.getCell(k).toString())) k--; - original_name = st.getCell(k).toString().replace("\n", "") - + "_" + ed.getCell(colNum).toString().replace("\n", ""); - column_name = ChineseCharacterUtil.getColumnNameByMemo(CommonUtil.removeKuoHao(st.getCell(k).toString())) - + "_" + ChineseCharacterUtil.getColumnNameByMemo(CommonUtil.removeKuoHao(ed.getCell(colNum).toString())); + + if (k == colNum) { + original_name = st.getCell(k).toString().replace("\n", ""); + column_name = ChineseCharacterUtil.getColumnNameByMemo(CommonUtil.removeKuoHao(st.getCell(k).toString())); + } else { + original_name = st.getCell(k).toString().replace("\n", "") + + "_" + ed.getCell(colNum).toString().replace("\n", ""); + column_name = ChineseCharacterUtil.getColumnNameByMemo(CommonUtil.removeKuoHao(st.getCell(k).toString())) + + "_" + ChineseCharacterUtil.getColumnNameByMemo(CommonUtil.removeKuoHao(ed.getCell(colNum).toString())); + } + Record record = new Record(); record.set("original_name", original_name); record.set("column_name", column_name.toLowerCase()); @@ -1661,7 +1668,7 @@ public class CollectModel { * @param job_id * @return */ - public List getAllSheetByJobId(int job_id) { + public List getAllSheetByJobId(int job_id) { String sql = "select * from t_collect_job_sheet where job_id=? order by sheet_index"; return Db.find(sql, job_id); } @@ -1672,7 +1679,7 @@ public class CollectModel { * @param table_name * @return */ - public List getTableStruct(String table_name) { + public List getTableStruct(String table_name) { String sql = "select column_name,excel_column_idx,original_name from t_collect_mapping where table_name=?"; return Db.find(sql, table_name); } @@ -1684,7 +1691,7 @@ public class CollectModel { * @param table_name * @return */ - public List getTableDataByJobId(int job_id, String table_name) { + public List getTableDataByJobId(int job_id, String table_name) { String sql = "select * from " + table_name + " where job_id = ?"; return Db.find(sql, job_id); } @@ -1696,7 +1703,7 @@ public class CollectModel { * @param filePath * @throws IOException */ - public void getSummaryExcel(int job_id, String filePath) throws IOException { //给定任务编号,获取它有哪些表 + public void getSummaryExcel(int job_id, String filePath) throws IOException { //给定任务编号,获取它有哪些表 // 创建工作簿和工作表 SXSSFWorkbook workbook = new SXSSFWorkbook();//默认100行,超100行将写入临时文件 workbook.setCompressTempFiles(false); //是否压缩临时文件,否则写入速度更快,但更占磁盘,但程序最后是会将临时文件删掉的