From 595b31273d583fbe367b3bfbebb6fc02e318abc0 Mon Sep 17 00:00:00 2001
From: zhizhijie <zhizhijie@users.noreply.gitee.com>
Date: 星期二, 22 九月 2026 16:51:25 +0800
Subject: [PATCH] fix(投资): 明细表取数三处静默缺陷 + 导入两处丢数/选错页签缺陷
---
traffic-audit-server/src/main/java/com/trafficaudit/dataimport/service/DataImportService.java | 75 +++++++++++++++++++++++++++++--------
1 files changed, 58 insertions(+), 17 deletions(-)
diff --git a/traffic-audit-server/src/main/java/com/trafficaudit/dataimport/service/DataImportService.java b/traffic-audit-server/src/main/java/com/trafficaudit/dataimport/service/DataImportService.java
index 446043d..da66293 100644
--- a/traffic-audit-server/src/main/java/com/trafficaudit/dataimport/service/DataImportService.java
+++ b/traffic-audit-server/src/main/java/com/trafficaudit/dataimport/service/DataImportService.java
@@ -2442,6 +2442,41 @@
|| normDash.contains(period) || normDash.contains(period.replace("-0", "-"));
}
+ /**
+ * 鎶ヨ〃鏈熷崟鍏冩牸鍛戒腑锛氭壂鎻� sheet 鍓� 8 琛岋紝鎵惧舰濡� 2026.08 / 2026骞�8鏈� / 2026-08-24 鐨勬姤琛ㄦ湡鏂囧瓧鎴栨棩鏈熷崟鍏冩牸銆�
+ * 鑳屾櫙锛�2026-09-22锛夛細娼滄睙鍗曡〃鍚� 20 涓巻鍙� sheet锛堟綔姹燂紙1鏈堬級鈥︽綔姹燂紙8鏈堬級鈥︼級锛屾棫閫昏緫鍙寜銆�8鏈堛�嶅尮閰� sheet 鍚嶏紝
+ * 浼氭妸 2018 骞寸殑銆屾綔姹燂紙8鏈堬級銆嶅綋鎴� 2026-08锛屽鍏ユ垚 2018 骞存暟鎹紱褰撴湡 sheet 鍚嶆槸銆屾綔姹燂紙2022.3锛夈�嶏紝
+ * 鍙兘闈犺〃鍐呮姤琛ㄦ湡锛�2026.08.24锛夎瘑鍒��
+ */
+ private boolean investSheetPeriodCellHit(Sheet sh, String period) {
+ if (sh == null || period == null || !period.matches("\\d{4}-\\d{2}")) return false;
+ String year = period.substring(0, 4);
+ int month = Integer.parseInt(period.substring(5, 7));
+ int last = Math.min(sh.getLastRowNum(), 7);
+ for (int r = 0; r <= last; r++) {
+ Row row = sh.getRow(r);
+ if (row == null) continue;
+ int lastCell = Math.max(1, row.getLastCellNum());
+ for (int c = 0; c < Math.min(lastCell, 12); c++) {
+ Cell cell = row.getCell(c);
+ if (cell == null) continue;
+ if (cell.getCellType() == CellType.NUMERIC && DateUtil.isCellDateFormatted(cell)) {
+ java.time.LocalDate d = cell.getLocalDateTimeCellValue().toLocalDate();
+ if (d.getYear() == Integer.parseInt(year) && d.getMonthValue() == month) return true;
+ continue;
+ }
+ String v = cellStr(row, c);
+ if (v == null) continue;
+ String t = v.trim().replace(" ", "");
+ if (t.isEmpty() || t.length() > 30) continue;
+ java.util.regex.Matcher mm = java.util.regex.Pattern
+ .compile("(\\d{4})\\s*[骞�.\\-/]\\s*(\\d{1,2})").matcher(t);
+ if (mm.find() && year.equals(mm.group(1)) && month == Integer.parseInt(mm.group(2))) return true;
+ }
+ }
+ return false;
+ }
+
/** 瑙ｆ瀽鍗曚釜甯傚窞鎶ヨ〃锛氶�� sheet锛堟姤琛ㄦ湡鍚嶄紭鍏� + 鏁版嵁琛屾暟锛夛紝鎸夊垪鍚嶆槧灏勬彁鍙栭」鐩 */
private void parseInvestCityWorkbook(Workbook wb, String fileName, String category, String period,
Set<String> fiveYearNames, List<InvestCityRow> rows, Map<String, Object> fr) {
@@ -2453,7 +2488,10 @@
Map<String, Integer> col = findInvestHeader(sh);
if (col == null) continue;
int cnt = countInvestRows(sh, col);
- int score = cnt + (cnt > 0 && investSheetMatchesPeriod(sh, period) ? 1000000 : 0);
+ // 2026-09-22锛氳〃鍐呮姤琛ㄦ湡锛堝崟鍏冩牸锛夊懡涓潈閲嶆渶楂樷�斺�斿巻鍙插悓鏈� sheet锛堝娼滄睙锛�8鏈堬級锛変笉鑳界洊杩囧綋鏈� sheet
+ boolean cellHit = cnt > 0 && investSheetPeriodCellHit(sh, period);
+ int score = cnt + (cnt > 0 && investSheetMatchesPeriod(sh, period) ? 1000000 : 0)
+ + (cellHit ? 2000000 : 0);
if (cnt > 0 && investSheetMatchesPeriod(sh, period)) {
// 褰撴湡鐪熷疄鎶ヨ〃 sheet 鍚嶉�氬父甯﹀勾浠斤紙濡� 2026.8/2026骞�8鏈堬級锛屽巻鍙瞫heet澶氫负绾湀浠藉悕锛�8鏈堬級锛氬甫骞翠唤鐨勪紭鍏�
String norm = sh.getSheetName() == null ? "" : sh.getSheetName().replace(" ", "");
@@ -2618,25 +2656,28 @@
/** 鍗曚釜琛ㄥご鍗曞厓鏍� -> 瀛楁閿紙null 琛ㄧず涓嶆槸琛ㄥご瀛楁锛夛紱渚涜〃澶磋鍒ゅ畾涓庡垪鏄犲皠鍏辩敤 */
private String investHeaderKey(String v) {
if (v == null) return null;
- String flat = v.replace(" ", "");
- if (v.contains("椤圭洰鍚嶇О")) return "name";
+ // 2026-09-22锛氳〃澶村崟鍏冩牸甯稿甫鎹㈣/鍏ㄨ绌烘牸锛堝澶╅棬銆岃嚜寮�濮嬪缓\n璁剧疮璁″畬\n鎴愭姇璧刓n(涓囧厓)銆嶏級锛�
+ // 缁熶竴鍘绘帀鍏ㄩ儴绌虹櫧鍚庡啀鍒ゅ畾鍏抽敭璇嶏紱鍚﹀垯 H(鑷紑濮嬪缓璁剧疮璁�)/J(鑷勾鍒濈疮璁�)/K(鏈湀瀹屾垚) 浼氬尮閰嶅け璐ワ紝
+ // 鍒楁槧灏勮惤鍒� -1 鈫� 涓変釜鏁板�艰鍐欐垚 0锛堝ぉ闂� 2026-08 灏辨槸杩欐牱涓㈢殑 16677.7/16677.7/500锛夈��
+ String flat = v.replaceAll("[\\s\\u3000]+", "");
+ if (flat.contains("椤圭洰鍚嶇О")) return "name";
// 銆屽幙锛堝競銆佸尯锛夈�嶇殑鍚勭鍐欐硶锛氬崐/鍏ㄨ鎷彿銆侀】鍙�/閫楀彿銆佹湁鏃犳嫭鍙凤紝缁熶竴褰掍竴鍖栧悗鍐嶅垽瀹�
String flatCounty = flat.replace("锛�", "(").replace("锛�", ")").replace("銆�", "").replace("锛�", "").replace(",", "");
if (flatCounty.contains("鍘�(甯傚尯)") || flatCounty.contains("鍘垮競鍖�") || flatCounty.contains("鍖哄幙")) return "county";
- if (v.contains("鎶曡祫寤鸿") || v.contains("寤鸿鍗曚綅") || v.contains("椤圭洰涓氫富")) return "builder";
- if (v.contains("寤鸿鎬ц川")) return "nature";
- if (v.contains("寮�宸�")) return "start";
- if (v.contains("绔ｅ伐") || v.contains("寤烘垚")) return "end";
- if ((v.contains("璁″垝鎬绘姇璧�") || v.contains("鎬绘姇璧�")) && !v.contains("绱")) return "total";
- if (v.contains("鑷紑濮嬪缓璁�")) return "startcum";
- if (v.contains("鏈勾璁″垝")) return "yearplan";
- if (v.contains("鑷勾鍒濈疮璁�")) return "yearcum";
- if (v.contains("鏈湀瀹屾垚")) return "monthdone";
- if (v.contains("寤鸿闃舵")) return "stage";
- if (v.contains("褰㈣薄杩涘害") || v.contains("寤鸿杩涘睍")) return "desc";
- if (v.contains("宸ュ彲") && !v.contains("椤圭洰鍚嶇О")) return "gk";
- if (v.contains("鍒濊") && !v.contains("椤圭洰鍚嶇О")) return "cs";
- if (v.contains("寤虹瓚闈㈢Н") && !v.contains("鏂板")) return "area";
+ if (flat.contains("鎶曡祫寤鸿") || flat.contains("寤鸿鍗曚綅") || flat.contains("椤圭洰涓氫富")) return "builder";
+ if (flat.contains("寤鸿鎬ц川")) return "nature";
+ if (flat.contains("寮�宸�")) return "start";
+ if (flat.contains("绔ｅ伐") || flat.contains("寤烘垚")) return "end";
+ if ((flat.contains("璁″垝鎬绘姇璧�") || flat.contains("鎬绘姇璧�")) && !flat.contains("绱")) return "total";
+ if (flat.contains("鑷紑濮嬪缓璁�")) return "startcum";
+ if (flat.contains("鏈勾璁″垝")) return "yearplan";
+ if (flat.contains("鑷勾鍒濈疮璁�")) return "yearcum";
+ if (flat.contains("鏈湀瀹屾垚")) return "monthdone";
+ if (flat.contains("寤鸿闃舵")) return "stage";
+ if (flat.contains("褰㈣薄杩涘害") || flat.contains("寤鸿杩涘睍")) return "desc";
+ if (flat.contains("宸ュ彲") && !flat.contains("椤圭洰鍚嶇О")) return "gk";
+ if (flat.contains("鍒濊") && !flat.contains("椤圭洰鍚嶇О")) return "cs";
+ if (flat.contains("寤虹瓚闈㈢Н") && !flat.contains("鏂板")) return "area";
return null;
}
--
Gitblit v1.9.1