Skip to content

T
tianjin-cement
Commit a56c0c2b authored by 竹天卫's avatar 竹天卫
Browse files
Options

3月10 日 问题修复

parent 624b9ace
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 27 deletions
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java
View file @ a56c0c2b
...@@ -3264,7 +3264,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -3264,7 +3264,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
} }
checkSampleVoList.add(checkSampleVo); checkSampleVoList.add(checkSampleVo);
} }
checkUserVo.setCheckSampleVoList(checkSampleVoList); checkUserVo.setCheckSampleVoList(checkSampleVoList.stream().sorted(Comparator.comparing(CheckSampleVo::getParallelCode)).collect(Collectors.toList()));
} }
} }
checkUserVoList.add(checkUserVo); checkUserVoList.add(checkUserVo);
...@@ -3524,7 +3524,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -3524,7 +3524,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
} }
} }
checkTeamGroupResultVo.setCheckSampleResultVoList(checkSampleResultVoList); checkTeamGroupResultVo.setCheckSampleResultVoList(checkSampleResultVoList.stream().sorted(Comparator.comparing(CheckSampleResultVo::getParallelCode)).collect(Collectors.toList()));
} }
checkTeamGroupResultVoList.add(checkTeamGroupResultVo); checkTeamGroupResultVoList.add(checkTeamGroupResultVo);
} }
......
cement-business/src/main/java/cn/wise/sc/cement/business/util/CheckCountUtil.java
View file @ a56c0c2b
...@@ -233,7 +233,7 @@ public class CheckCountUtil { ...@@ -233,7 +233,7 @@ public class CheckCountUtil {
BigDecimal m = getBigDecimal(resultMap.get("样重m").trim()); BigDecimal m = getBigDecimal(resultMap.get("样重m").trim());
//计算的核心公式结果 //计算的核心公式结果
BigDecimal countResult = m2.subtract(m1).subtract(m3).divide(m,4).multiply(new BigDecimal(0.343)); BigDecimal countResult = m2.subtract(m1).subtract(m3).divide(m,4).multiply(new BigDecimal(0.343));
endResult = countResult.multiply(param100).setScale(2,BigDecimal.ROUND_HALF_UP); endResult = countResult.multiply(param100).setScale(2,BigDecimal.ROUND_HALF_EVEN);
}else{ }else{
endResult = new BigDecimal(0); endResult = new BigDecimal(0);
} }
...@@ -330,7 +330,7 @@ public class CheckCountUtil { ...@@ -330,7 +330,7 @@ public class CheckCountUtil {
BigDecimal SZ_M1 = getBigDecimal(resultMap.get("烧重M1").trim()); BigDecimal SZ_M1 = getBigDecimal(resultMap.get("烧重M1").trim());
//计算的核心公式结果 //计算的核心公式结果
BigDecimal countResult = YZ_M1.add(MZ_M1).subtract(SZ_M1).divide(YZ_M1,4); BigDecimal countResult = YZ_M1.add(MZ_M1).subtract(SZ_M1).divide(YZ_M1,4);
endResult = countResult.multiply(param100).setScale(3,BigDecimal.ROUND_HALF_UP); endResult = countResult.multiply(param100).setScale(3,BigDecimal.ROUND_HALF_EVEN);
} }
}else if(name.equals("Mad2")){ }else if(name.equals("Mad2")){
if( StringUtils.isNotBlank(resultMap.get("样重M2")) && if( StringUtils.isNotBlank(resultMap.get("样重M2")) &&
...@@ -342,7 +342,7 @@ public class CheckCountUtil { ...@@ -342,7 +342,7 @@ public class CheckCountUtil {
BigDecimal SZ_M2 = getBigDecimal(resultMap.get("烧重M2").trim()); BigDecimal SZ_M2 = getBigDecimal(resultMap.get("烧重M2").trim());
//计算的核心公式结果 //计算的核心公式结果
BigDecimal countResult = YZ_M2.add(MZ_M2).subtract(SZ_M2).divide(YZ_M2,4); BigDecimal countResult = YZ_M2.add(MZ_M2).subtract(SZ_M2).divide(YZ_M2,4);
endResult = countResult.multiply(param100).setScale(3,BigDecimal.ROUND_HALF_UP); endResult = countResult.multiply(param100).setScale(3,BigDecimal.ROUND_HALF_EVEN);
} }
}else if(name.equals("Aad1")){ }else if(name.equals("Aad1")){
...@@ -355,7 +355,7 @@ public class CheckCountUtil { ...@@ -355,7 +355,7 @@ public class CheckCountUtil {
BigDecimal YZ_A1 = getBigDecimal(resultMap.get("样重A1").trim()); BigDecimal YZ_A1 = getBigDecimal(resultMap.get("样重A1").trim());
//计算的核心公式结果 //计算的核心公式结果
BigDecimal countResult = SZ_A1.subtract(MZ_A1).divide(YZ_A1,4); BigDecimal countResult = SZ_A1.subtract(MZ_A1).divide(YZ_A1,4);
endResult = countResult.multiply(param100).setScale(3,BigDecimal.ROUND_HALF_UP); endResult = countResult.multiply(param100).setScale(3,BigDecimal.ROUND_HALF_EVEN);
} }
}else if(name.equals("Aad2")){ }else if(name.equals("Aad2")){
...@@ -368,7 +368,7 @@ public class CheckCountUtil { ...@@ -368,7 +368,7 @@ public class CheckCountUtil {
BigDecimal YZ_A2 = getBigDecimal(resultMap.get("样重A2").trim()); BigDecimal YZ_A2 = getBigDecimal(resultMap.get("样重A2").trim());
//计算的核心公式结果 //计算的核心公式结果
BigDecimal countResult = SZ_A2.subtract(MZ_A2).divide(YZ_A2,4); BigDecimal countResult = SZ_A2.subtract(MZ_A2).divide(YZ_A2,4);
endResult = countResult.multiply(param100).setScale(3,BigDecimal.ROUND_HALF_UP); endResult = countResult.multiply(param100).setScale(3,BigDecimal.ROUND_HALF_EVEN);
} }
}else if(name.equals("焦渣")){ }else if(name.equals("焦渣")){
...@@ -446,11 +446,13 @@ public class CheckCountUtil { ...@@ -446,11 +446,13 @@ public class CheckCountUtil {
} }
}else if(StringUtils.isNotBlank(resultMap.get("显示值"))){ }else if(StringUtils.isNotBlank(resultMap.get("显示值"))){
BigDecimal displaySO3= getBigDecimal(resultMap.get("显示值").trim()); BigDecimal displaySO3= getBigDecimal(resultMap.get("显示值").trim());
count = displaySO3.multiply(new BigDecimal(2.5)); count = displaySO3.multiply(new BigDecimal(2.5)).setScale(2, BigDecimal.ROUND_HALF_EVEN);
} }
//如果有值按照“四舍六入五留双”修约规则保留至小数后两位
return count==null?"":count.toString(); return count==null?"":count.toString();
} }
/** /**
* 求合量 L.O.I+SiO2+(Al2O3+TiO2)+Al2O3+Fe2O3+CaO+MgO+TiO2+K2O+Na2O+MnO+SO3 * 求合量 L.O.I+SiO2+(Al2O3+TiO2)+Al2O3+Fe2O3+CaO+MgO+TiO2+K2O+Na2O+MnO+SO3
* @param countMap * @param countMap
...@@ -474,7 +476,7 @@ public class CheckCountUtil { ...@@ -474,7 +476,7 @@ public class CheckCountUtil {
for(String s:list) { for(String s:list) {
count = count.add(new BigDecimal(s)); count = count.add(new BigDecimal(s));
} }
return count.setScale(2,BigDecimal.ROUND_HALF_UP).toString(); return count.setScale(2,BigDecimal.ROUND_HALF_EVEN).toString();
} }
/** /**
...@@ -495,7 +497,7 @@ public class CheckCountUtil { ...@@ -495,7 +497,7 @@ public class CheckCountUtil {
BigDecimal SiO2 = getBigDecimal(countMap.get("SiO<sub>2</sub>")); BigDecimal SiO2 = getBigDecimal(countMap.get("SiO<sub>2</sub>"));
KH =CaO.subtract(new BigDecimal(1.65).multiply(Al2O3_TiO2)).subtract(new BigDecimal(0.35).multiply(Fe2O3)).divide(new BigDecimal(2.8),4).divide(SiO2,4); KH =CaO.subtract(new BigDecimal(1.65).multiply(Al2O3_TiO2)).subtract(new BigDecimal(0.35).multiply(Fe2O3)).divide(new BigDecimal(2.8),4).divide(SiO2,4);
} }
return KH==null?"":KH.setScale(3,BigDecimal.ROUND_HALF_UP).toString(); return KH==null?"":KH.setScale(3,BigDecimal.ROUND_HALF_EVEN).toString();
} }
/** /**
...@@ -514,7 +516,7 @@ public class CheckCountUtil { ...@@ -514,7 +516,7 @@ public class CheckCountUtil {
BigDecimal Fe2O3 = getBigDecimal(countMap.get("Fe<sub>2</sub>O<sub>3</sub>")); BigDecimal Fe2O3 = getBigDecimal(countMap.get("Fe<sub>2</sub>O<sub>3</sub>"));
SM = SiO2.divide(Al2O3_TiO2.add(Fe2O3),4); SM = SiO2.divide(Al2O3_TiO2.add(Fe2O3),4);
} }
return SM==null?"":SM.setScale(2,BigDecimal.ROUND_HALF_UP).toString(); return SM==null?"":SM.setScale(2,BigDecimal.ROUND_HALF_EVEN).toString();
} }
/** /**
...@@ -531,7 +533,7 @@ public class CheckCountUtil { ...@@ -531,7 +533,7 @@ public class CheckCountUtil {
BigDecimal Fe2O3 = getBigDecimal(countMap.get("Fe<sub>2</sub>O<sub>3</sub>")); BigDecimal Fe2O3 = getBigDecimal(countMap.get("Fe<sub>2</sub>O<sub>3</sub>"));
AM = Al2O3_TiO2.divide(Fe2O3,4); AM = Al2O3_TiO2.divide(Fe2O3,4);
} }
return AM==null?"":AM.setScale(2,BigDecimal.ROUND_HALF_UP).toString(); return AM==null?"":AM.setScale(2,BigDecimal.ROUND_HALF_EVEN).toString();
} }
/** /**
...@@ -585,7 +587,7 @@ public class CheckCountUtil { ...@@ -585,7 +587,7 @@ public class CheckCountUtil {
BC_Mad = Mad1.add(Mad2).divide(new BigDecimal(2),4); BC_Mad = Mad1.add(Mad2).divide(new BigDecimal(2),4);
} }
return BC_Mad==null?"":BC_Mad.setScale(2,BigDecimal.ROUND_HALF_UP).toString(); return BC_Mad==null?"":BC_Mad.setScale(2,BigDecimal.ROUND_HALF_EVEN).toString();
} }
/** /**
...@@ -608,7 +610,7 @@ public class CheckCountUtil { ...@@ -608,7 +610,7 @@ public class CheckCountUtil {
Mad = BC_Mad.subtract(new BigDecimal(0.00000000001)).setScale(2,BigDecimal.ROUND_HALF_UP); Mad = BC_Mad.subtract(new BigDecimal(0.00000000001)).setScale(2,BigDecimal.ROUND_HALF_UP);
} }
} }
return Mad==null?"":Mad.setScale(2,BigDecimal.ROUND_HALF_UP).toString(); return Mad==null?"":Mad.setScale(2,BigDecimal.ROUND_HALF_EVEN).toString();
} }
/** /**
...@@ -627,7 +629,7 @@ public class CheckCountUtil { ...@@ -627,7 +629,7 @@ public class CheckCountUtil {
BC_Aad = Aad1.add(Aad2).divide(new BigDecimal(2),4); BC_Aad = Aad1.add(Aad2).divide(new BigDecimal(2),4);
} }
return BC_Aad==null?"":BC_Aad.setScale(2,BigDecimal.ROUND_HALF_UP).toString(); return BC_Aad==null?"":BC_Aad.setScale(2,BigDecimal.ROUND_HALF_EVEN).toString();
} }
/** /**
...@@ -649,7 +651,7 @@ public class CheckCountUtil { ...@@ -649,7 +651,7 @@ public class CheckCountUtil {
Aad = BC_Aad.subtract(new BigDecimal(0.00000000001)).setScale(2,BigDecimal.ROUND_HALF_UP); Aad = BC_Aad.subtract(new BigDecimal(0.00000000001)).setScale(2,BigDecimal.ROUND_HALF_UP);
} }
} }
return Aad==null?"":Aad.setScale(2,BigDecimal.ROUND_HALF_UP).toString(); return Aad==null?"":Aad.setScale(2,BigDecimal.ROUND_HALF_EVEN).toString();
} }
/** /**
...@@ -675,7 +677,7 @@ public class CheckCountUtil { ...@@ -675,7 +677,7 @@ public class CheckCountUtil {
} }
return count==null?"":count.setScale(3,BigDecimal.ROUND_HALF_UP).toString(); return count==null?"":count.setScale(3,BigDecimal.ROUND_HALF_EVEN).toString();
} }
/** /**
...@@ -699,7 +701,7 @@ public class CheckCountUtil { ...@@ -699,7 +701,7 @@ public class CheckCountUtil {
BigDecimal countResult = YZ_V2.add(MZ_V2).subtract(SZ_V2).divide(YZ_V2,4); BigDecimal countResult = YZ_V2.add(MZ_V2).subtract(SZ_V2).divide(YZ_V2,4);
count = countResult.multiply(param100).subtract(BC_Mad); count = countResult.multiply(param100).subtract(BC_Mad);
} }
return count==null?"":count.setScale(3,BigDecimal.ROUND_HALF_UP).toString(); return count==null?"":count.setScale(3,BigDecimal.ROUND_HALF_EVEN).toString();
} }
/** /**
...@@ -717,7 +719,7 @@ public class CheckCountUtil { ...@@ -717,7 +719,7 @@ public class CheckCountUtil {
//计算Vad1 和 Vad2 的平均值 //计算Vad1 和 Vad2 的平均值
BC_Vad = Vad1.add(Vad2).divide(new BigDecimal(2),4); BC_Vad = Vad1.add(Vad2).divide(new BigDecimal(2),4);
} }
return BC_Vad==null?"":BC_Vad.setScale(2,BigDecimal.ROUND_HALF_UP).toString(); return BC_Vad==null?"":BC_Vad.setScale(2,BigDecimal.ROUND_HALF_EVEN).toString();
} }
/** /**
...@@ -740,7 +742,7 @@ public class CheckCountUtil { ...@@ -740,7 +742,7 @@ public class CheckCountUtil {
Vad = BC_Vad.subtract(new BigDecimal(0.00000000001)).setScale(2,BigDecimal.ROUND_HALF_UP); Vad = BC_Vad.subtract(new BigDecimal(0.00000000001)).setScale(2,BigDecimal.ROUND_HALF_UP);
} }
} }
return Vad==null?"":Vad.setScale(2,BigDecimal.ROUND_HALF_UP).toString(); return Vad==null?"":Vad.setScale(2,BigDecimal.ROUND_HALF_EVEN).toString();
} }
/** /**
...@@ -782,7 +784,7 @@ public class CheckCountUtil { ...@@ -782,7 +784,7 @@ public class CheckCountUtil {
)))); ))));
} }
return K1_==null?"":K1_.setScale(1,BigDecimal.ROUND_HALF_UP).toString(); return K1_==null?"":K1_.setScale(1,BigDecimal.ROUND_HALF_EVEN).toString();
} }
/** /**
...@@ -1021,7 +1023,7 @@ public class CheckCountUtil { ...@@ -1021,7 +1023,7 @@ public class CheckCountUtil {
count = value.multiply(new BigDecimal(4.1816)).divide(param1000,4); count = value.multiply(new BigDecimal(4.1816)).divide(param1000,4);
} }
return count==null?"":count.setScale(2,BigDecimal.ROUND_HALF_UP).toString(); return count==null?"":count.setScale(2,BigDecimal.ROUND_HALF_EVEN).toString();
} }
/** /**
...@@ -1141,9 +1143,9 @@ public class CheckCountUtil { ...@@ -1141,9 +1143,9 @@ public class CheckCountUtil {
int resultInt1 = result1.setScale( 0, BigDecimal.ROUND_DOWN ).intValue(); int resultInt1 = result1.setScale( 0, BigDecimal.ROUND_DOWN ).intValue();
BigDecimal endResult = null; BigDecimal endResult = null;
if((resultInt1&1) == 1){ //如果结果为奇数 if((resultInt1&1) == 1){ //如果结果为奇数
endResult = aveCount.setScale(2,BigDecimal.ROUND_HALF_UP); endResult = aveCount.setScale(2,BigDecimal.ROUND_HALF_EVEN);
}else{ }else{
endResult = aveCount.subtract(new BigDecimal(0.0000000001)).setScale(2,BigDecimal.ROUND_HALF_UP); endResult = aveCount.subtract(new BigDecimal(0.0000000001)).setScale(2,BigDecimal.ROUND_HALF_EVEN);
} }
return endResult.toString(); return endResult.toString();
} }
...@@ -1175,15 +1177,15 @@ public class CheckCountUtil { ...@@ -1175,15 +1177,15 @@ public class CheckCountUtil {
BigDecimal result1 = aveCount.multiply(param100); BigDecimal result1 = aveCount.multiply(param100);
int resultInt1 = result1.setScale( 0, BigDecimal.ROUND_DOWN ).intValue(); int resultInt1 = result1.setScale( 0, BigDecimal.ROUND_DOWN ).intValue();
if((resultInt1&1) == 1){ //如果结果为奇数 if((resultInt1&1) == 1){ //如果结果为奇数
ResultsValue = aveCount.setScale(2,BigDecimal.ROUND_HALF_UP); ResultsValue = aveCount.setScale(2,BigDecimal.ROUND_HALF_EVEN);
}else{ }else{
ResultsValue = aveCount.subtract(new BigDecimal(0.0000000001)).setScale(2,BigDecimal.ROUND_HALF_UP); ResultsValue = aveCount.subtract(new BigDecimal(0.0000000001)).setScale(2,BigDecimal.ROUND_HALF_EVEN);
} }
} }
//最大误差值 //最大误差值
BigDecimal errorValue = null; BigDecimal errorValue = null;
if(maxNum != null && minNum != null){ if(maxNum != null && minNum != null){
errorValue = maxNum.subtract(minNum).setScale(2,BigDecimal.ROUND_HALF_UP); errorValue = maxNum.subtract(minNum).setScale(2,BigDecimal.ROUND_HALF_EVEN);
} }
countResults.put(entry.getKey(),ResultsValue == null?"":ResultsValue.toString()); countResults.put(entry.getKey(),ResultsValue == null?"":ResultsValue.toString());
countError.put(entry.getKey(),errorValue==null?"":errorValue.toString()); countError.put(entry.getKey(),errorValue==null?"":errorValue.toString());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment