|
@@ -1046,6 +1046,7 @@ public class AsyncTask {
|
|
|
BigDecimal fcxbsjll = normConfig.getFCXBSJLL();
|
|
|
BigDecimal fclbsl = normConfig.getFCLBSL();
|
|
|
BigDecimal fcxbgzxl = normConfig.getFCXBGZXL();
|
|
|
+ BigDecimal jsslSjz = normConfig.getJsslSjz();
|
|
|
|
|
|
//结算结果
|
|
|
TXinyiCalculate tXinyiCalculate = new TXinyiCalculate();
|
|
@@ -1133,6 +1134,28 @@ public class AsyncTask {
|
|
|
tXinyiCalculate.setWhlRN(DECIMAL_1200.divide(divide, NUMBER_SCALE_4, RoundingMode.HALF_UP).multiply(BigDecimal_100));
|
|
|
else
|
|
|
tXinyiCalculate.setWhlRN(DECIMAL_1620.divide(divide, NUMBER_SCALE_4, RoundingMode.HALF_UP).multiply(BigDecimal_100));
|
|
|
+ //2025年03月19日16:43:12 新增超污染物限制 和 超污染物负荷 进出水五大指标相关计算
|
|
|
+ if(!Objects.isNull(jsslSjz) && jsslSjz.compareTo(BigDecimal.ZERO) > 0){
|
|
|
+ tXinyiCalculate.setJsCodCwrwfh(getCwrwfhzByDetail(jsSlq, tXinyiIndustry.getJsCod(), jsslSjz, normConfig.getJscodSjz()));
|
|
|
+ tXinyiCalculate.setJsSsCwrwfh(getCwrwfhzByDetail(jsSlq, tXinyiIndustry.getJsSs(), jsslSjz, normConfig.getJsssSjz()));
|
|
|
+ tXinyiCalculate.setJsZdCwrwfh(getCwrwfhzByDetail(jsSlq, tXinyiIndustry.getJsTn(), jsslSjz, normConfig.getJszdSjz()));
|
|
|
+ tXinyiCalculate.setJsZlCwrwfh(getCwrwfhzByDetail(jsSlq, tXinyiIndustry.getJsTp(), jsslSjz, normConfig.getJszlSjz()));
|
|
|
+ tXinyiCalculate.setJsAdCwrwfh(getCwrwfhzByDetail(jsSlq, tXinyiIndustry.getJsNh3(), jsslSjz, normConfig.getJsadSjz()));
|
|
|
+ }
|
|
|
+
|
|
|
+ tXinyiCalculate.setCsCodCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getCsCod(), normConfig, CS_COD.getCode(), false));
|
|
|
+ tXinyiCalculate.setCsSsCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getCsSs(), normConfig, CS_SS.getCode(), false));
|
|
|
+ tXinyiCalculate.setCsZdCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getCsTn(), normConfig, CS_ZD.getCode(), false));
|
|
|
+ tXinyiCalculate.setCsZlCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getCsTp(), normConfig, CS_ZL.getCode(), false));
|
|
|
+ tXinyiCalculate.setCsAdCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getCsNh3(), normConfig, CS_AD.getCode(), false));
|
|
|
+
|
|
|
+ tXinyiCalculate.setJsCodCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getJsCod(), normConfig, JS_COD.getCode(), false));
|
|
|
+ tXinyiCalculate.setJsSsCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getJsSs(), normConfig, JS_SS.getCode(), false));
|
|
|
+ tXinyiCalculate.setJsZdCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getJsTn(), normConfig, JS_ZD.getCode(), false));
|
|
|
+ tXinyiCalculate.setJsZlCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getJsTp(), normConfig, JS_ZL.getCode(), false));
|
|
|
+ tXinyiCalculate.setJsAdCwrwxz(getCwrwxzByDetail(tXinyiIndustry.getJsNh3(), normConfig, JS_AD.getCode(), false));
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
return tXinyiCalculate;
|
|
|
}
|