From 08b52ba6e8930958456ed58a1d39805caa7fe014 Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Wed, 12 Jul 2023 20:24:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into dev
---
screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java
index ac5f16e..d5682c1 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java
@@ -382,8 +382,10 @@
if (Double.parseDouble(CO)<4){
count++;
}
- if (Double.parseDouble(O8)<160){
- count++;
+ if (!O8.equals("--")) {
+ if (Double.parseDouble(O8) < 160) {
+ count++;
+ }
}
--
Gitblit v1.8.0