lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-01-25 15:55:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
lihongjie0209
2023-10-22 20:12:07 +08:00
parent 7f3c2b338e
commit c241ad869d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisItemVo.java
View File

@@ -307,8 +307,10 @@ public class CoalWashingDailyAnalysisItemVo {
if (count2 == 0) sysDdp2 = null;
if (StringUtils.equals(type, "2")) {
ddp1 = (1 + (sysDdp1 - prev.getSysDdp1()) / prev.getSysDdp1()) * prev.ddp1;
ddp2 = (1 + (sysDdp2 - prev.getSysDdp2()) / prev.getSysDdp1()) * prev.ddp2;
if (prev.getSysDdp1() != null && prev.ddp1 != null && sysDdp1 != null)
ddp1 = (1 + (sysDdp1 - prev.getSysDdp1()) / prev.getSysDdp1()) * prev.ddp1;
if (prev.getSysDdp2() != null && prev.ddp2 != null && sysDdp2 != null)
ddp2 = (1 + (sysDdp2 - prev.getSysDdp2()) / prev.getSysDdp2()) * prev.ddp2;
}
if (ddp1 != null && sysDdp1 != null) avgDdp1 = (ddp1 + sysDdp1) / 2.0;