From bd656bece66cc5383a87893086729eb2b3c6258f Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Tue, 7 Nov 2023 20:04:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=BA=E7=A9=BA=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=82=E4=B8=8E=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoalWashingDailyAnalysisItemVo.java       | 220 +++++++++++++-----
 1 file changed, 160 insertions(+), 60 deletions(-)

diff --git a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisItemVo.java b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisItemVo.java
index 15ff9497..e31e8b5c 100644
--- a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisItemVo.java
+++ b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisItemVo.java
@@ -225,85 +225,185 @@ public class CoalWashingDailyAnalysisItemVo {
         sysDdp2 = 0.0;
         int count1 = 0;
         int count2 = 0;
-        if (c0p0 != null && c0p1 != null) {
-            sysDdp1 += c0p1 * c0p0 / 100.00;
-            count1++;
+        if (c0p0 != null) {
+            if (c0p1 != null) {
+
+                sysDdp1 += c0p1 * c0p0 / 100.00;
+                count1++;
+            } else {
+                sysDdp1 = null;
+            }
         }
-        if (c0p0 != null && c0p2 != null) {
-            sysDdp2 += c0p2 * c0p0 / 100.00;
-            count2++;
+        if (c0p0 != null) {
+            if (c0p2 != null) {
+
+                sysDdp2 += c0p2 * c0p0 / 100.00;
+                count2++;
+            } else {
+                sysDdp2 = null;
+            }
         }
-        if (c1p0 != null && c1p1 != null) {
-            sysDdp1 += c1p1 * c1p0 / 100.00;
-            count1++;
+        if (c1p0 != null) {
+            if (c1p1 != null) {
+
+                sysDdp1 += c1p1 * c1p0 / 100.00;
+                count1++;
+            } else {
+                sysDdp1 = null;
+            }
         }
-        if (c1p0 != null && c1p2 != null) {
-            sysDdp2 += c1p2 * c1p0 / 100.00;
-            count2++;
+        if (c1p0 != null) {
+            if (c1p2 != null) {
+
+                sysDdp2 += c1p2 * c1p0 / 100.00;
+                count2++;
+            } else {
+                sysDdp2 = null;
+            }
         }
-        if (c2p0 != null && c2p1 != null) {
-            sysDdp1 += c2p1 * c2p0 / 100.00;
-            count1++;
+        if (c2p0 != null) {
+            if (c2p1 != null) {
+
+                sysDdp1 += c2p1 * c2p0 / 100.00;
+                count1++;
+            } else {
+                sysDdp1 = null;
+            }
         }
-        if (c2p0 != null && c2p2 != null) {
-            sysDdp2 += c2p2 * c2p0 / 100.00;
-            count2++;
+        if (c2p0 != null) {
+            if (c2p2 != null) {
+
+                sysDdp2 += c2p2 * c2p0 / 100.00;
+                count2++;
+            } else {
+                sysDdp2 = null;
+            }
         }
-        if (c3p0 != null && c3p1 != null) {
-            sysDdp1 += c3p1 * c3p0 / 100.00;
-            count1++;
+        if (c3p0 != null) {
+            if (c3p1 != null) {
+
+                sysDdp1 += c3p1 * c3p0 / 100.00;
+                count1++;
+            } else {
+                sysDdp1 = null;
+            }
         }
-        if (c3p0 != null && c3p2 != null) {
-            sysDdp2 += c3p2 * c3p0 / 100.00;
-            count2++;
+        if (c3p0 != null) {
+            if (c3p2 != null) {
+
+                sysDdp2 += c3p2 * c3p0 / 100.00;
+                count2++;
+            } else {
+                sysDdp2 = null;
+            }
         }
-        if (c4p0 != null && c4p1 != null) {
-            sysDdp1 += c4p1 * c4p0 / 100.00;
-            count1++;
+        if (c4p0 != null) {
+            if (c4p1 != null) {
+
+                sysDdp1 += c4p1 * c4p0 / 100.00;
+                count1++;
+            } else {
+                sysDdp1 = null;
+            }
         }
-        if (c4p0 != null && c4p2 != null) {
-            sysDdp2 += c4p2 * c4p0 / 100.00;
-            count2++;
+        if (c4p0 != null) {
+            if (c4p2 != null) {
+
+                sysDdp2 += c4p2 * c4p0 / 100.00;
+                count2++;
+            } else {
+                sysDdp2 = null;
+            }
         }
-        if (c5p0 != null && c5p1 != null) {
-            sysDdp1 += c5p1 * c5p0 / 100.00;
-            count1++;
+        if (c5p0 != null) {
+            if (c5p1 != null) {
+
+                sysDdp1 += c5p1 * c5p0 / 100.00;
+                count1++;
+            } else {
+                sysDdp1 = null;
+            }
         }
-        if (c5p0 != null && c5p2 != null) {
-            sysDdp2 += c5p2 * c5p0 / 100.00;
-            count2++;
+        if (c5p0 != null) {
+            if (c5p2 != null) {
+
+                sysDdp2 += c5p2 * c5p0 / 100.00;
+                count2++;
+            } else {
+                sysDdp2 = null;
+            }
         }
-        if (c6p0 != null && c6p1 != null) {
-            sysDdp1 += c6p1 * c6p0 / 100.00;
-            count1++;
+        if (c6p0 != null) {
+            if (c6p1 != null) {
+
+                sysDdp1 += c6p1 * c6p0 / 100.00;
+                count1++;
+            } else {
+                sysDdp1 = null;
+            }
         }
-        if (c6p0 != null && c6p2 != null) {
-            sysDdp2 += c6p2 * c6p0 / 100.00;
-            count2++;
+        if (c6p0 != null) {
+            if (c6p2 != null) {
+
+                sysDdp2 += c6p2 * c6p0 / 100.00;
+                count2++;
+            } else {
+                sysDdp2 = null;
+            }
         }
-        if (c7p0 != null && c7p1 != null) {
-            sysDdp1 += c7p1 * c7p0 / 100.00;
-            count1++;
+        if (c7p0 != null) {
+            if (c7p1 != null) {
+
+                sysDdp1 += c7p1 * c7p0 / 100.00;
+                count1++;
+            } else {
+                sysDdp1 = null;
+            }
         }
-        if (c7p0 != null && c7p2 != null) {
-            sysDdp2 += c7p2 * c7p0 / 100.00;
-            count2++;
+        if (c7p0 != null) {
+            if (c7p2 != null) {
+
+                sysDdp2 += c7p2 * c7p0 / 100.00;
+                count2++;
+            } else {
+                sysDdp2 = null;
+            }
         }
-        if (c8p0 != null && c8p1 != null) {
-            sysDdp1 += c8p1 * c8p0 / 100.00;
-            count1++;
+        if (c8p0 != null) {
+            if (c8p1 != null) {
+
+                sysDdp1 += c8p1 * c8p0 / 100.00;
+                count1++;
+            } else {
+                sysDdp1 = null;
+            }
         }
-        if (c8p0 != null && c8p2 != null) {
-            sysDdp2 += c8p2 * c8p0 / 100.00;
-            count2++;
+        if (c8p0 != null) {
+            if (c8p2 != null) {
+
+                sysDdp2 += c8p2 * c8p0 / 100.00;
+                count2++;
+            } else {
+                sysDdp2 = null;
+            }
         }
-        if (c9p0 != null && c9p1 != null) {
-            sysDdp1 += c9p1 * c9p0 / 100.00;
-            count1++;
+        if (c9p0 != null) {
+            if (c9p1 != null) {
+
+                sysDdp1 += c9p1 * c9p0 / 100.00;
+                count1++;
+            } else {
+                sysDdp1 = null;
+            }
         }
-        if (c9p0 != null && c9p2 != null) {
-            sysDdp2 += c9p2 * c9p0 / 100.00;
-            count2++;
+        if (c9p0 != null) {
+            if (c9p2 != null) {
+
+                sysDdp2 += c9p2 * c9p0 / 100.00;
+                count2++;
+            } else {
+                sysDdp2 = null;
+            }
         }
 
         if (count1 == 0) sysDdp1 = null;