质量月报 - 碳二反应器性能指标表格

master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportController.java

@@ -338,7 +338,10 @@ public class TMonthlyQualityReportController extends BaseController
         if (ma1InList.size() != 0) { ma1InAvg = ma1InSum.divide(new BigDecimal(ma1InList.size()), 2, RoundingMode.HALF_UP); }
         if (ethane3OutList.size() != 0) { ethane3OutAvg = ethane3OutSum.divide(new BigDecimal(ethane3OutList.size()), 2, RoundingMode.HALF_UP); }
         if (ethylene3OutList.size() != 0) { ethylene3OutAvg = ethylene3OutSum.divide(new BigDecimal(ethylene3OutList.size()), 2, RoundingMode.HALF_UP); }
-        if (acetylene3OutList.size() != 0) { acetylene3OutAvg = acetylene3OutSum.divide(new BigDecimal(acetylene3OutList.size()), 2, RoundingMode.HALF_UP); }
+        if (acetylene3OutList.size() != 0) {
+            acetylene3OutAvg = acetylene3OutSum.divide(new BigDecimal(acetylene3OutList.size()), 2, RoundingMode.HALF_UP)
+                    .divide(new BigDecimal("10000"), 5, RoundingMode.HALF_UP);
+        }
         if (propane3OutList.size() != 0) { propane3OutAvg = propane3OutSum.divide(new BigDecimal(propane3OutList.size()), 2, RoundingMode.HALF_UP); }
         if (propylene3OutList.size() != 0) { propylene3OutAvg = propylene3OutSum.divide(new BigDecimal(propylene3OutList.size()), 2, RoundingMode.HALF_UP); }
         if (pd3OutList.size() != 0) { pd3OutAvg = pd3OutSum.divide(new BigDecimal(pd3OutList.size()), 2, RoundingMode.HALF_UP); }
@@ -352,7 +355,10 @@ public class TMonthlyQualityReportController extends BaseController
         if (ma2InList.size() != 0) { ma2InAvg = ma2InSum.divide(new BigDecimal(ma2InList.size()), 2, RoundingMode.HALF_UP); }
         if (ethane3InList.size() != 0) { ethane3InAvg = ethane3InSum.divide(new BigDecimal(ethane3InList.size()), 2, RoundingMode.HALF_UP); }
         if (ethylene3InList.size() != 0) { ethylene3InAvg = ethylene3InSum.divide(new BigDecimal(ethylene3InList.size()), 2, RoundingMode.HALF_UP); }
-        if (acetylene3InList.size() != 0) { acetylene3InAvg = acetylene3InSum.divide(new BigDecimal(acetylene3InList.size()), 2, RoundingMode.HALF_UP); }
+        if (acetylene3InList.size() != 0) {
+            acetylene3InAvg = acetylene3InSum.divide(new BigDecimal(acetylene3InList.size()), 2, RoundingMode.HALF_UP)
+                    .divide(new BigDecimal("10000"), 5, RoundingMode.HALF_UP);
+        }
         if (propane3InList.size() != 0) { propane3InAvg = propane3InSum.divide(new BigDecimal(propane3InList.size()), 2, RoundingMode.HALF_UP); }
         if (propylene3InList.size() != 0) { propylene3InAvg = propylene3InSum.divide(new BigDecimal(propylene3InList.size()), 2, RoundingMode.HALF_UP); }
         if (pd3InList.size() != 0) { pd3InAvg = pd3InSum.divide(new BigDecimal(pd3InList.size()), 2, RoundingMode.HALF_UP); }
@@ -383,28 +389,28 @@ public class TMonthlyQualityReportController extends BaseController
                     .multiply((acetylene1InAvg.subtract(acetylene2InAvg)).divide(acetylene1InAvg, 2, RoundingMode.HALF_UP));
         }
         conversionLoad1stIn = acetyleneConversion1stIn;
-//        if (ethane1InAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene1InAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene1InAvg.compareTo(BigDecimal.ZERO) != 0
-//                && ethane2InAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene2InAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene2InAvg.compareTo(BigDecimal.ZERO) != 0) {
-//            ethyleneSelectivity1stIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
-//                    .multiply(((ethylene2InAvg.divide(ethane2InAvg.add(ethylene2InAvg).add(acetylene2InAvg), 2, RoundingMode.HALF_UP))
-//                    .subtract(ethylene1InAvg.divide(ethane1InAvg.add(ethylene1InAvg).add(acetylene1InAvg), 2, RoundingMode.HALF_UP)))
-//                    .divide(((acetylene1InAvg.divide(ethane1InAvg.add(ethylene1InAvg).add(acetylene1InAvg), 2, RoundingMode.HALF_UP))
-//                    .subtract(acetylene2InAvg.divide(ethane2InAvg.add(ethylene2InAvg).add(acetylene2InAvg), 2, RoundingMode.HALF_UP))), 2, RoundingMode.HALF_UP));
-//        }
+        if (ethane1InAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene1InAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene1InAvg.compareTo(BigDecimal.ZERO) != 0
+                && ethane2InAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene2InAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene2InAvg.compareTo(BigDecimal.ZERO) != 0) {
+            ethyleneSelectivity1stIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
+                    .multiply(((ethylene2InAvg.divide(ethane2InAvg.add(ethylene2InAvg).add(acetylene2InAvg), 5, RoundingMode.HALF_UP))
+                    .subtract(ethylene1InAvg.divide(ethane1InAvg.add(ethylene1InAvg).add(acetylene1InAvg), 5, RoundingMode.HALF_UP)))
+                    .divide(((acetylene1InAvg.divide(ethane1InAvg.add(ethylene1InAvg).add(acetylene1InAvg), 5, RoundingMode.HALF_UP))
+                    .subtract(acetylene2InAvg.divide(ethane2InAvg.add(ethylene2InAvg).add(acetylene2InAvg), 5, RoundingMode.HALF_UP))), 5, RoundingMode.HALF_UP));
+        }
         if ((pd1InAvg.add(ma1InAvg)).compareTo(BigDecimal.ZERO) != 0) {
             mapdConversion1stIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
-                    .multiply((pd1InAvg.add(ma1InAvg).add(pd2InAvg).add(ma2InAvg)).divide(pd1InAvg.add(ma1InAvg), 2, RoundingMode.HALF_UP));
+                    .multiply((pd1InAvg.add(ma1InAvg).subtract(pd2InAvg).subtract(ma2InAvg)).divide(pd1InAvg.add(ma1InAvg), 2, RoundingMode.HALF_UP));
+        }
+        if (propane1InAvg.compareTo(BigDecimal.ZERO) != 0 && propylene1InAvg.compareTo(BigDecimal.ZERO) != 0
+                && pd1InAvg.compareTo(BigDecimal.ZERO) != 0 && ma1InAvg.compareTo(BigDecimal.ZERO) != 0
+                && propane2InAvg.compareTo(BigDecimal.ZERO) != 0 && propylene2InAvg.compareTo(BigDecimal.ZERO) != 0
+                && pd2InAvg.compareTo(BigDecimal.ZERO) != 0 && ma2InAvg.compareTo(BigDecimal.ZERO) != 0) {
+            propyleneSelectivity1stIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
+                    .multiply(((propylene2InAvg.divide((propane2InAvg.add(propylene2InAvg).add(pd2InAvg).add(ma2InAvg)), 5, RoundingMode.HALF_UP))
+                     .subtract(propylene1InAvg.divide((propane1InAvg.add(propylene1InAvg).add(pd1InAvg).add(ma1InAvg)), 5, RoundingMode.HALF_UP)))
+                     .divide((((pd1InAvg.add(ma1InAvg)).divide((propane1InAvg.add(propylene1InAvg).add(pd1InAvg).add(ma1InAvg)), 5, RoundingMode.HALF_UP))
+                     .subtract((pd2InAvg.add(ma2InAvg).divide((propane2InAvg.add(propylene2InAvg).add(pd2InAvg).add(ma2InAvg)), 5, RoundingMode.HALF_UP)))), 5, RoundingMode.HALF_UP));
         }
-//        if (propane1InAvg.compareTo(BigDecimal.ZERO) != 0 && propylene1InAvg.compareTo(BigDecimal.ZERO) != 0
-//                && pd1InAvg.compareTo(BigDecimal.ZERO) != 0 && ma1InAvg.compareTo(BigDecimal.ZERO) != 0
-//                && propane2InAvg.compareTo(BigDecimal.ZERO) != 0 && propylene2InAvg.compareTo(BigDecimal.ZERO) != 0
-//                && pd2InAvg.compareTo(BigDecimal.ZERO) != 0 && ma2InAvg.compareTo(BigDecimal.ZERO) != 0) {
-//            propyleneSelectivity1stIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
-//                    .multiply(((propylene2InAvg.divide((propane2InAvg.add(propylene2InAvg).add(pd2InAvg).add(ma2InAvg)), 2, RoundingMode.HALF_UP))
-//                     .subtract(propylene1InAvg.divide((propane1InAvg.add(propylene1InAvg).add(pd1InAvg).add(ma1InAvg)), 2, RoundingMode.HALF_UP)))
-//                     .divide((((pd1InAvg.add(ma1InAvg)).divide((propane1InAvg.add(propylene1InAvg).add(pd1InAvg).add(ma1InAvg)), 2, RoundingMode.HALF_UP))
-//                     .subtract((pd2InAvg.add(ma2InAvg).divide((propane2InAvg.add(propylene2InAvg).add(pd2InAvg).add(ma2InAvg)), 2, RoundingMode.HALF_UP)))), 2, RoundingMode.HALF_UP));
-//        }
         if (acetylene2InAvg.compareTo(BigDecimal.ZERO) != 0) {
             acetyleneConversion2ndIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
                     .multiply((acetylene2InAvg.subtract(acetylene3InAvg)).divide(acetylene2InAvg, 2, RoundingMode.HALF_UP));
@@ -413,28 +419,28 @@ public class TMonthlyQualityReportController extends BaseController
             conversionLoad2ndIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
                     .multiply((acetylene2InAvg.subtract(acetylene3InAvg)).divide(acetylene1InAvg, 2, RoundingMode.HALF_UP));
         }
-//        if (ethane2InAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene2InAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene2InAvg.compareTo(BigDecimal.ZERO) != 0
-//                && ethane3InAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene3InAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene3InAvg.compareTo(BigDecimal.ZERO) != 0) {
-//            ethyleneSelectivity2ndIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
-//                    .multiply(((ethylene3InAvg.divide(ethane3InAvg.add(ethylene3InAvg).add(acetylene3InAvg), 2, RoundingMode.HALF_UP))
-//                    .subtract(ethylene2InAvg.divide(ethane2InAvg.add(ethylene2InAvg).add(acetylene2InAvg), 2, RoundingMode.HALF_UP)))
-//                    .divide(((acetylene2InAvg.divide(ethane2InAvg.add(ethylene2InAvg).add(acetylene2InAvg), 2, RoundingMode.HALF_UP))
-//                    .subtract(acetylene3InAvg.divide(ethane3InAvg.add(ethylene3InAvg).add(acetylene3InAvg), 2, RoundingMode.HALF_UP))), 2, RoundingMode.HALF_UP));
-//        }
+        if (ethane2InAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene2InAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene2InAvg.compareTo(BigDecimal.ZERO) != 0
+                && ethane3InAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene3InAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene3InAvg.compareTo(BigDecimal.ZERO) != 0) {
+            ethyleneSelectivity2ndIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
+                    .multiply(((ethylene3InAvg.divide(ethane3InAvg.add(ethylene3InAvg).add(acetylene3InAvg), 5, RoundingMode.HALF_UP))
+                    .subtract(ethylene2InAvg.divide(ethane2InAvg.add(ethylene2InAvg).add(acetylene2InAvg), 5, RoundingMode.HALF_UP)))
+                    .divide(((acetylene2InAvg.divide(ethane2InAvg.add(ethylene2InAvg).add(acetylene2InAvg), 5, RoundingMode.HALF_UP))
+                    .subtract(acetylene3InAvg.divide(ethane3InAvg.add(ethylene3InAvg).add(acetylene3InAvg), 5, RoundingMode.HALF_UP))), 5, RoundingMode.HALF_UP));
+        }
         if ((pd2InAvg.add(ma2InAvg)).compareTo(BigDecimal.ZERO) != 0) {
             mapdConversion2ndIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
-                    .multiply((pd2InAvg.add(ma2InAvg).add(pd3InAvg).add(ma3InAvg)).divide(pd2InAvg.add(ma2InAvg), 2, RoundingMode.HALF_UP));
+                    .multiply((pd2InAvg.add(ma2InAvg).subtract(pd3InAvg).subtract(ma3InAvg)).divide(pd2InAvg.add(ma2InAvg), 2, RoundingMode.HALF_UP));
+        }
+        if (propane2InAvg.compareTo(BigDecimal.ZERO) != 0 && propylene2InAvg.compareTo(BigDecimal.ZERO) != 0
+                && pd2InAvg.compareTo(BigDecimal.ZERO) != 0 && ma2InAvg.compareTo(BigDecimal.ZERO) != 0
+                && propane3InAvg.compareTo(BigDecimal.ZERO) != 0 && propylene3InAvg.compareTo(BigDecimal.ZERO) != 0
+                && pd3InAvg.compareTo(BigDecimal.ZERO) != 0 && ma3InAvg.compareTo(BigDecimal.ZERO) != 0) {
+            propyleneSelectivity2ndIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
+                    .multiply(((propylene3InAvg.divide((propane3InAvg.add(propylene3InAvg).add(pd3InAvg).add(ma3InAvg)), 5, RoundingMode.HALF_UP))
+                    .subtract(propylene2InAvg.divide((propane2InAvg.add(propylene2InAvg).add(pd2InAvg).add(ma2InAvg)), 5, RoundingMode.HALF_UP)))
+                    .divide((((pd2InAvg.add(ma2InAvg)).divide((propane2InAvg.add(propylene2InAvg).add(pd2InAvg).add(ma2InAvg)), 5, RoundingMode.HALF_UP))
+                    .subtract((pd3InAvg.add(ma3InAvg).divide((propane3InAvg.add(propylene3InAvg).add(pd3InAvg).add(ma3InAvg)), 5, RoundingMode.HALF_UP)))), 5, RoundingMode.HALF_UP));
         }
-//        if (propane2InAvg.compareTo(BigDecimal.ZERO) != 0 && propylene2InAvg.compareTo(BigDecimal.ZERO) != 0
-//                && pd2InAvg.compareTo(BigDecimal.ZERO) != 0 && ma2InAvg.compareTo(BigDecimal.ZERO) != 0
-//                && propane3InAvg.compareTo(BigDecimal.ZERO) != 0 && propylene3InAvg.compareTo(BigDecimal.ZERO) != 0
-//                && pd3InAvg.compareTo(BigDecimal.ZERO) != 0 && ma3InAvg.compareTo(BigDecimal.ZERO) != 0) {
-//            propyleneSelectivity2ndIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
-//                    .multiply(((propylene3InAvg.divide((propane3InAvg.add(propylene3InAvg).add(pd3InAvg).add(ma3InAvg)), 2, RoundingMode.HALF_UP))
-//                    .subtract(propylene2InAvg.divide((propane2InAvg.add(propylene2InAvg).add(pd2InAvg).add(ma2InAvg)), 2, RoundingMode.HALF_UP)))
-//                    .divide((((pd2InAvg.add(ma2InAvg)).divide((propane2InAvg.add(propylene2InAvg).add(pd2InAvg).add(ma2InAvg)), 2, RoundingMode.HALF_UP))
-//                    .subtract((pd3InAvg.add(ma3InAvg).divide((propane3InAvg.add(propylene3InAvg).add(pd3InAvg).add(ma3InAvg)), 2, RoundingMode.HALF_UP)))), 2, RoundingMode.HALF_UP));
-//        }
         if (acetylene3InAvg.compareTo(BigDecimal.ZERO) != 0) {
             acetyleneConversion3rdIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
                     .multiply((acetylene3InAvg.subtract(acetylene3OutAvg)).divide(acetylene3InAvg, 2, RoundingMode.HALF_UP));
@@ -443,54 +449,54 @@ public class TMonthlyQualityReportController extends BaseController
             conversionLoad3rdIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
                     .multiply((acetylene3InAvg.subtract(acetylene3OutAvg)).divide(acetylene1InAvg, 2, RoundingMode.HALF_UP));
         }
-//        if (ethane3InAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene3InAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene3InAvg.compareTo(BigDecimal.ZERO) != 0
-//                && ethane3OutAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene3OutAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene3OutAvg.compareTo(BigDecimal.ZERO) != 0) {
-//            ethyleneSelectivity3rdIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
-//                    .multiply(((ethylene3OutAvg.divide(ethane3OutAvg.add(ethylene3OutAvg).add(acetylene3OutAvg), 2, RoundingMode.HALF_UP))
-//                    .subtract(ethylene3InAvg.divide(ethane3InAvg.add(ethylene3InAvg).add(acetylene3InAvg), 2, RoundingMode.HALF_UP)))
-//                    .divide(((acetylene3InAvg.divide(ethane3InAvg.add(ethylene3InAvg).add(acetylene3InAvg), 2, RoundingMode.HALF_UP))
-//                    .subtract(acetylene3OutAvg.divide(ethane3OutAvg.add(ethylene3OutAvg).add(acetylene3OutAvg), 2, RoundingMode.HALF_UP))), 2, RoundingMode.HALF_UP));
-//        }
+        if (ethane3InAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene3InAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene3InAvg.compareTo(BigDecimal.ZERO) != 0
+                && ethane3OutAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene3OutAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene3OutAvg.compareTo(BigDecimal.ZERO) != 0) {
+            ethyleneSelectivity3rdIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
+                    .multiply(((ethylene3OutAvg.divide(ethane3OutAvg.add(ethylene3OutAvg).add(acetylene3OutAvg), 5, RoundingMode.HALF_UP))
+                    .subtract(ethylene3InAvg.divide(ethane3InAvg.add(ethylene3InAvg).add(acetylene3InAvg), 5, RoundingMode.HALF_UP)))
+                    .divide(((acetylene3InAvg.divide(ethane3InAvg.add(ethylene3InAvg).add(acetylene3InAvg), 5, RoundingMode.HALF_UP))
+                    .subtract(acetylene3OutAvg.divide(ethane3OutAvg.add(ethylene3OutAvg).add(acetylene3OutAvg), 5, RoundingMode.HALF_UP))), 5, RoundingMode.HALF_UP));
+        }
         if ((pd3InAvg.add(ma3InAvg)).compareTo(BigDecimal.ZERO) != 0) {
             mapdConversion3rdIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
-                    .multiply((pd3InAvg.add(ma3InAvg).add(pd3OutAvg).add(ma3OutAvg)).divide(pd3InAvg.add(ma3InAvg), 2, RoundingMode.HALF_UP));
+                    .multiply((pd3InAvg.add(ma3InAvg).subtract(pd3OutAvg).subtract(ma3OutAvg)).divide(pd3InAvg.add(ma3InAvg), 2, RoundingMode.HALF_UP));
+        }
+        if (propane3InAvg.compareTo(BigDecimal.ZERO) != 0 && propylene3InAvg.compareTo(BigDecimal.ZERO) != 0
+                && pd3InAvg.compareTo(BigDecimal.ZERO) != 0 && ma3InAvg.compareTo(BigDecimal.ZERO) != 0
+                && propane3OutAvg.compareTo(BigDecimal.ZERO) != 0 && propylene3OutAvg.compareTo(BigDecimal.ZERO) != 0
+                && pd3OutAvg.compareTo(BigDecimal.ZERO) != 0 && ma3OutAvg.compareTo(BigDecimal.ZERO) != 0) {
+            propyleneSelectivity3rdIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
+                    .multiply(((propylene3OutAvg.divide((propane3OutAvg.add(propylene3OutAvg).add(pd3OutAvg).add(ma3OutAvg)), 5, RoundingMode.HALF_UP))
+                    .subtract(propylene3InAvg.divide((propane3InAvg.add(propylene3InAvg).add(pd3InAvg).add(ma3InAvg)), 5, RoundingMode.HALF_UP)))
+                    .divide((((pd3InAvg.add(ma3InAvg)).divide((propane3InAvg.add(propylene3InAvg).add(pd3InAvg).add(ma3InAvg)), 5, RoundingMode.HALF_UP))
+                    .subtract((pd3OutAvg.add(ma3OutAvg).divide((propane3OutAvg.add(propylene3OutAvg).add(pd3OutAvg).add(ma3OutAvg)), 5, RoundingMode.HALF_UP)))), 5, RoundingMode.HALF_UP));
         }
-//        if (propane3InAvg.compareTo(BigDecimal.ZERO) != 0 && propylene3InAvg.compareTo(BigDecimal.ZERO) != 0
-//                && pd3InAvg.compareTo(BigDecimal.ZERO) != 0 && ma3InAvg.compareTo(BigDecimal.ZERO) != 0
-//                && propane3OutAvg.compareTo(BigDecimal.ZERO) != 0 && propylene3OutAvg.compareTo(BigDecimal.ZERO) != 0
-//                && pd3OutAvg.compareTo(BigDecimal.ZERO) != 0 && ma3OutAvg.compareTo(BigDecimal.ZERO) != 0) {
-//            propyleneSelectivity3rdIn = BigDecimal.TEN.multiply(BigDecimal.TEN)
-//                    .multiply(((propylene3OutAvg.divide((propane3OutAvg.add(propylene3OutAvg).add(pd3OutAvg).add(ma3OutAvg)), 2, RoundingMode.HALF_UP))
-//                    .subtract(propylene3InAvg.divide((propane3InAvg.add(propylene3InAvg).add(pd3InAvg).add(ma3InAvg)), 2, RoundingMode.HALF_UP)))
-//                    .divide((((pd3InAvg.add(ma3InAvg)).divide((propane3InAvg.add(propylene3InAvg).add(pd3InAvg).add(ma3InAvg)), 2, RoundingMode.HALF_UP))
-//                    .subtract((pd3OutAvg.add(ma3OutAvg).divide((propane3OutAvg.add(propylene3OutAvg).add(pd3OutAvg).add(ma3OutAvg)), 2, RoundingMode.HALF_UP)))), 2, RoundingMode.HALF_UP));
-//        }
         if (acetylene1InAvg.compareTo(BigDecimal.ZERO) != 0) {
             acetyleneConversion3rdOut = BigDecimal.TEN.multiply(BigDecimal.TEN)
                     .multiply((acetylene1InAvg.subtract(acetylene3OutAvg)).divide(acetylene1InAvg, 2, RoundingMode.HALF_UP));
         }
-//        if (ethane1InAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene1InAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene1InAvg.compareTo(BigDecimal.ZERO) != 0
-//                && ethane3OutAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene3OutAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene3OutAvg.compareTo(BigDecimal.ZERO) != 0) {
-//            ethyleneSelectivity3rdOut = BigDecimal.TEN.multiply(BigDecimal.TEN)
-//                    .multiply(((ethylene3OutAvg.divide(ethane3OutAvg.add(ethylene3OutAvg).add(acetylene3OutAvg), 2, RoundingMode.HALF_UP))
-//                    .subtract(ethylene1InAvg.divide(ethane1InAvg.add(ethylene1InAvg).add(acetylene1InAvg), 2, RoundingMode.HALF_UP)))
-//                    .divide(((acetylene1InAvg.divide(ethane1InAvg.add(ethylene1InAvg).add(acetylene1InAvg), 2, RoundingMode.HALF_UP))
-//                    .subtract(acetylene3OutAvg.divide(ethane3OutAvg.add(ethylene3OutAvg).add(acetylene3OutAvg), 2, RoundingMode.HALF_UP))), 2, RoundingMode.HALF_UP));
-//        }
+        if (ethane1InAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene1InAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene1InAvg.compareTo(BigDecimal.ZERO) != 0
+                && ethane3OutAvg.compareTo(BigDecimal.ZERO) != 0 && ethylene3OutAvg.compareTo(BigDecimal.ZERO) != 0 && acetylene3OutAvg.compareTo(BigDecimal.ZERO) != 0) {
+            ethyleneSelectivity3rdOut = BigDecimal.TEN.multiply(BigDecimal.TEN)
+                    .multiply(((ethylene3OutAvg.divide(ethane3OutAvg.add(ethylene3OutAvg).add(acetylene3OutAvg), 5, RoundingMode.HALF_UP))
+                    .subtract(ethylene1InAvg.divide(ethane1InAvg.add(ethylene1InAvg).add(acetylene1InAvg), 5, RoundingMode.HALF_UP)))
+                    .divide(((acetylene1InAvg.divide(ethane1InAvg.add(ethylene1InAvg).add(acetylene1InAvg), 5, RoundingMode.HALF_UP))
+                    .subtract(acetylene3OutAvg.divide(ethane3OutAvg.add(ethylene3OutAvg).add(acetylene3OutAvg), 5, RoundingMode.HALF_UP))), 5, RoundingMode.HALF_UP));
+        }
         if ((pd1InAvg.add(ma1InAvg)).compareTo(BigDecimal.ZERO) != 0) {
             mapdConversion3rdOut = BigDecimal.TEN.multiply(BigDecimal.TEN)
-                    .multiply((pd1InAvg.add(ma1InAvg).add(pd3OutAvg).add(ma3OutAvg)).divide(pd1InAvg.add(ma1InAvg), 2, RoundingMode.HALF_UP));
+                    .multiply((pd1InAvg.add(ma1InAvg).subtract(pd3OutAvg).subtract(ma3OutAvg)).divide(pd1InAvg.add(ma1InAvg), 2, RoundingMode.HALF_UP));
+        }
+        if (propane1InAvg.compareTo(BigDecimal.ZERO) != 0 && propylene1InAvg.compareTo(BigDecimal.ZERO) != 0
+                && pd1InAvg.compareTo(BigDecimal.ZERO) != 0 && ma1InAvg.compareTo(BigDecimal.ZERO) != 0
+                && propane3OutAvg.compareTo(BigDecimal.ZERO) != 0 && propylene3OutAvg.compareTo(BigDecimal.ZERO) != 0
+                && pd3OutAvg.compareTo(BigDecimal.ZERO) != 0 && ma3OutAvg.compareTo(BigDecimal.ZERO) != 0) {
+            propyleneSelectivity3rdOut = BigDecimal.TEN.multiply(BigDecimal.TEN)
+                    .multiply(((propylene3OutAvg.divide((propane3OutAvg.add(propylene3OutAvg).add(pd3OutAvg).add(ma3OutAvg)), 5, RoundingMode.HALF_UP))
+                    .subtract(propylene1InAvg.divide((propane1InAvg.add(propylene1InAvg).add(pd1InAvg).add(ma1InAvg)), 5, RoundingMode.HALF_UP)))
+                    .divide((((pd1InAvg.add(ma1InAvg)).divide((propane1InAvg.add(propylene1InAvg).add(pd1InAvg).add(ma1InAvg)), 5, RoundingMode.HALF_UP))
+                    .subtract((pd3OutAvg.add(ma3OutAvg).divide((propane3OutAvg.add(propylene3OutAvg).add(pd3OutAvg).add(ma3OutAvg)), 5, RoundingMode.HALF_UP)))), 5, RoundingMode.HALF_UP));
         }
-//        if (propane1InAvg.compareTo(BigDecimal.ZERO) != 0 && propylene1InAvg.compareTo(BigDecimal.ZERO) != 0
-//                && pd1InAvg.compareTo(BigDecimal.ZERO) != 0 && ma1InAvg.compareTo(BigDecimal.ZERO) != 0
-//                && propane3OutAvg.compareTo(BigDecimal.ZERO) != 0 && propylene3OutAvg.compareTo(BigDecimal.ZERO) != 0
-//                && pd3OutAvg.compareTo(BigDecimal.ZERO) != 0 && ma3OutAvg.compareTo(BigDecimal.ZERO) != 0) {
-//            propyleneSelectivity3rdOut = BigDecimal.TEN.multiply(BigDecimal.TEN)
-//                    .multiply(((propylene3OutAvg.divide((propane3OutAvg.add(propylene3OutAvg).add(pd3OutAvg).add(ma3OutAvg)), 2, RoundingMode.HALF_UP))
-//                    .subtract(propylene1InAvg.divide((propane1InAvg.add(propylene1InAvg).add(pd1InAvg).add(ma1InAvg)), 2, RoundingMode.HALF_UP)))
-//                    .divide((((pd1InAvg.add(ma1InAvg)).divide((propane1InAvg.add(propylene1InAvg).add(pd1InAvg).add(ma1InAvg)), 2, RoundingMode.HALF_UP))
-//                    .subtract((pd3OutAvg.add(ma3OutAvg).divide((propane3OutAvg.add(propylene3OutAvg).add(pd3OutAvg).add(ma3OutAvg)), 2, RoundingMode.HALF_UP)))), 2, RoundingMode.HALF_UP));
-//        }
         C2ReactorTableVO tableVO = new C2ReactorTableVO();
         tableVO.setEthane1InAvg(ethane1InAvg);
         tableVO.setEthylene1InAvg(ethylene1InAvg);

ui/src/views/production/quality/index.vue

@@ -2269,38 +2269,38 @@
         </tr>
         <tr>
           <td class="td-dark-green">acetylene Conversion</td>
-          <td class="td-transparent">{{c2ReactorTableData.acetyleneConversion1stIn}}</td>
-          <td class="td-transparent">{{c2ReactorTableData.acetyleneConversion2ndIn}}</td>
-          <td class="td-transparent">{{c2ReactorTableData.acetyleneConversion3rdIn}}</td>
-          <td class="td-dark-green">{{c2ReactorTableData.acetyleneConversion3rdOut}}</td>
+          <td class="td-transparent">{{c2ReactorTableData.acetyleneConversion1stIn}}%</td>
+          <td class="td-transparent">{{c2ReactorTableData.acetyleneConversion2ndIn}}%</td>
+          <td class="td-transparent">{{c2ReactorTableData.acetyleneConversion3rdIn}}%</td>
+          <td class="td-dark-green">{{c2ReactorTableData.acetyleneConversion3rdOut}}%</td>
         </tr>
         <tr>
           <td class="td-dark-green">Conversion load%</td>
-          <td class="td-transparent">{{c2ReactorTableData.conversionLoad1stIn}}</td>
-          <td class="td-transparent">{{c2ReactorTableData.conversionLoad2ndIn}}</td>
-          <td class="td-transparent">{{c2ReactorTableData.conversionLoad3rdIn}}</td>
+          <td class="td-transparent">{{c2ReactorTableData.conversionLoad1stIn}}%</td>
+          <td class="td-transparent">{{c2ReactorTableData.conversionLoad2ndIn}}%</td>
+          <td class="td-transparent">{{c2ReactorTableData.conversionLoad3rdIn}}%</td>
           <td class="td-dark-green"></td>
         </tr>
         <tr>
           <td class="td-dark-green">Ethylene Selectivity</td>
-          <td class="td-transparent">{{c2ReactorTableData.ethyleneSelectivity1stIn}}</td>
-          <td class="td-transparent">{{c2ReactorTableData.ethyleneSelectivity2ndIn}}</td>
-          <td class="td-transparent">{{c2ReactorTableData.ethyleneSelectivity3rdIn}}</td>
-          <td class="td-dark-green">{{c2ReactorTableData.ethyleneSelectivity3rdOut}}</td>
+          <td class="td-transparent">{{c2ReactorTableData.ethyleneSelectivity1stIn}}%</td>
+          <td class="td-transparent">{{c2ReactorTableData.ethyleneSelectivity2ndIn}}%</td>
+          <td class="td-transparent">{{c2ReactorTableData.ethyleneSelectivity3rdIn}}%</td>
+          <td class="td-dark-green">{{c2ReactorTableData.ethyleneSelectivity3rdOut}}%</td>
         </tr>
         <tr>
           <td class="td-dark-green">MAPD Conversion</td>
-          <td class="td-transparent">{{c2ReactorTableData.mapdConversion1stIn}}</td>
-          <td class="td-transparent">{{c2ReactorTableData.mapdConversion2ndIn}}</td>
-          <td class="td-transparent">{{c2ReactorTableData.mapdConversion3rdIn}}</td>
-          <td class="td-yellow">{{c2ReactorTableData.mapdConversion3rdOut}}</td>
+          <td class="td-transparent">{{c2ReactorTableData.mapdConversion1stIn}}%</td>
+          <td class="td-transparent">{{c2ReactorTableData.mapdConversion2ndIn}}%</td>
+          <td class="td-transparent">{{c2ReactorTableData.mapdConversion3rdIn}}%</td>
+          <td class="td-yellow">{{c2ReactorTableData.mapdConversion3rdOut}}%</td>
         </tr>
         <tr>
           <td class="td-dark-green">Propylene Selectivity</td>
-          <td class="td-transparent">{{c2ReactorTableData.propyleneSelectivity1stIn}}</td>
-          <td class="td-transparent">{{c2ReactorTableData.propyleneSelectivity2ndIn}}</td>
-          <td class="td-transparent">{{c2ReactorTableData.propyleneSelectivity3rdIn}}</td>
-          <td class="td-yellow">{{c2ReactorTableData.propyleneSelectivity3rdOut}}</td>
+          <td class="td-transparent">{{c2ReactorTableData.propyleneSelectivity1stIn}}%</td>
+          <td class="td-transparent">{{c2ReactorTableData.propyleneSelectivity2ndIn}}%</td>
+          <td class="td-transparent">{{c2ReactorTableData.propyleneSelectivity3rdIn}}%</td>
+          <td class="td-yellow">{{c2ReactorTableData.propyleneSelectivity3rdOut}}%</td>
         </tr>
       </table>
       <table v-if="showC3Table">