From 909fd8929d7906f1dca68acc05e36e29b0b9192c Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 15 十一月 2022 10:57:30 +0800
Subject: [PATCH] 2022.11.15
---
src/main/kotlin/cn/flightfeather/supervision/business/report/template/ProAnalysisSummary.kt | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/report/template/ProAnalysisSummary.kt b/src/main/kotlin/cn/flightfeather/supervision/business/report/template/ProAnalysisSummary.kt
index c845469..0899468 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/report/template/ProAnalysisSummary.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/report/template/ProAnalysisSummary.kt
@@ -34,7 +34,7 @@
val r = cols[0].getOneRow(rowData)
val r1 = cols[1].getOneRow(rowData)
-// val r2 = cols[2].getOneRow(rowData)
+ val r2 = cols[2].getOneRow(rowData)
val k = rowData.scene?.townname
if (!districtMap.containsKey(k)) {
@@ -76,15 +76,11 @@
changeNum += cNum
+ //鏍规嵁瑙勮寖鎬у拰鐩戠绛栫暐缁撴灉鍒ゆ柇鏄惁涓洪噸鐐圭洃绠″璞�
val standard = r1[1] as ExcelUtil.MyCell
- if (standard.text.contains("涓ラ噸涓嶈鑼�")) {
+ if (standard.text.contains("涓ラ噸涓嶈鑼�") || r2[0].toString().contains("7銆�")) {
focusSceneNum++
}
-
- //鏍规嵁鐩戠绛栫暐缁撴灉鍒ゆ柇鏄惁涓洪噸鐐圭洃绠″璞�
-// if (r2[0].toString().contains("7銆�")) {
-// focusSceneNum++
-// }
}
}
--
Gitblit v1.9.3