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

bugfix

Browse Source
This commit is contained in:
lihongjie0209
2023-10-17 22:08:31 +08:00
parent 026784c891
commit fb1b1ec589
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisEntity.java
View File

@@ -8,6 +8,7 @@ import lombok.Data;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.annotations.Comment;
import java.time.LocalDate;
@@ -89,8 +90,15 @@ public class CoalWashingDailyAnalysisEntity extends OrgCommonEntity {
}
inputItems.sort(
Comparator.comparing(x -> ObjectUtils.defaultIfNull(x.getTime(), LocalTime.MIN)));
inputItems.forEach(
coalWashingDailyAnalysisItemVo -> coalWashingDailyAnalysisItemVo.calculate(type));
for (int i = 0; i < inputItems.size(); i++) {
CoalWashingDailyAnalysisItemVo coalWashingDailyAnalysisItemVo = inputItems.get(i);
if (StringUtils.equals(type, "2") && i == inputItems.size() - 1) {
coalWashingDailyAnalysisItemVo.calculate(type);
} else {
coalWashingDailyAnalysisItemVo.calculate("1");
}
}
Double prevNumber = ObjectUtils.defaultIfNull(initTotalNumber, 0.0);
// 总的权重