Merge branch 'master' into dev

slibra-admin/src/main/java/com/slibra/web/controller/business/FrontController.java

@@ -515,7 +515,7 @@ public class FrontController extends BaseController {
     /**
      * 通过ID获取碳排放主详细信息
      */
-    @GetMapping(value = "/bigModel/carbonSmart/getCarbonDetailsByMonth/{id}")
+    @GetMapping(value = "/bigModel/carbonSmart/getCarbonDetailsById/{id}")
     public R<TXinyiCarbonMajor> getCarbonDetailsById(@PathVariable("id") Long id)
     {
         return R.ok(tXinyiCarbonMajorService.getCarbonDetailsById(id));

slibra-system/src/main/java/com/slibra/business/service/impl/TXinyiCarbonMajorServiceImpl.java

@@ -366,11 +366,11 @@ public class TXinyiCarbonMajorServiceImpl implements ITXinyiCarbonMajorService
                         wnclBwqrsPfyz = BigDecimal.ZERO;
                     }
                 }
-                wnclBwqrsCh4Co2 = wnclBwqrsFsl.multiply(wnclBwqrsPfyz).multiply(BigDecimal_28).divide(BigDecimal_1000, NUMBER_SCALE_2, RoundingMode.HALF_UP);
-                tXinyiCarbonMajorUpdate.setWnclBwqrsCh4Co2(wnclBwqrsCh4Co2);
-                wnclBwqrsN2oCo2 = wnclBwqrsFsl.multiply(BigDecimal_0_99).multiply(BigDecimal_265).divide(BigDecimal_1000, NUMBER_SCALE_2, RoundingMode.HALF_UP);
-                tXinyiCarbonMajorUpdate.setWnclBwqrsN2oCo2(wnclBwqrsN2oCo2);
             }
+            wnclBwqrsCh4Co2 = wnclBwqrsFsl.multiply(wnclBwqrsPfyz).multiply(BigDecimal_28).divide(BigDecimal_1000, NUMBER_SCALE_2, RoundingMode.HALF_UP);
+            tXinyiCarbonMajorUpdate.setWnclBwqrsCh4Co2(wnclBwqrsCh4Co2);
+            wnclBwqrsN2oCo2 = wnclBwqrsFsl.multiply(BigDecimal_0_99).multiply(BigDecimal_265).divide(BigDecimal_1000, NUMBER_SCALE_2, RoundingMode.HALF_UP);
+            tXinyiCarbonMajorUpdate.setWnclBwqrsN2oCo2(wnclBwqrsN2oCo2);
         }
 
         //污泥处理-污泥热解碳化或气化过程化石源CO-污泥热解过程排放的CH₄的CO₂当量（t CO₂-eq/月）