王子文 月报 bug fix

master/src/main/java/com/ruoyi/project/production/service/impl/TDailyProductionReportServiceImpl.java

@@ -130,7 +130,7 @@ public class TDailyProductionReportServiceImpl implements ITDailyProductionRepor
             return "";
         }
         return new BigDecimal(raw)
-                .setScale(scale, RoundingMode.HALF_EVEN)
+                .setScale(scale + 2, RoundingMode.HALF_EVEN)
                 .toString();
     }
 
@@ -147,7 +147,7 @@ public class TDailyProductionReportServiceImpl implements ITDailyProductionRepor
         }
         return new BigDecimal(raw)
                 .multiply(new BigDecimal("100"))
-                .setScale(scale, RoundingMode.HALF_EVEN)
+                .setScale(scale + 2, RoundingMode.HALF_EVEN)
                 .toString() + "%";
     }
 

master/src/main/java/com/ruoyi/project/production/service/impl/thread/SyncAfterMonthlyUpdateThread.java

@@ -226,7 +226,13 @@ public class SyncAfterMonthlyUpdateThread extends Thread {
                     .divide(calendarHour, 2, RoundingMode.HALF_UP);
         }
         report.setSubConGljcl(subConGljcl.toString());
+        if (calendarHour.compareTo(BigDecimal.ZERO) != 0) {
+            subConCc = subConHpProduct.divide(calendarHour, 2, RoundingMode.HALF_UP);
+        }
         report.setSubConCc(subConCc.toString());
+        if (calendarHour.compareTo(BigDecimal.ZERO) != 0) {
+            subConSc = new BigDecimal("0").subtract((subConHhpSteam.add(subConHpSteamFrSubNet)).divide(calendarHour, 2, RoundingMode.HALF_UP));
+        }
         report.setSubConSc(subConSc.toString());
 
         String subConElectricStr = report.getSubConElectric();