Commit da698ec0 authored by 竹天卫's avatar 竹天卫

S03 计算结果 优化

parent 7dbe1ea0
...@@ -395,6 +395,12 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -395,6 +395,12 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
} }
public static void main(String[] args) { public static void main(String[] args) {
BigDecimal displaySO3= new BigDecimal(0.01);
BigDecimal count = displaySO3.multiply(new BigDecimal(2.5)).setScale(2, BigDecimal.ROUND_HALF_EVEN);
System.out.println(count.toString());
String URL = "https://lab.wisenergy.cn/lab-bangye?id="+12+"&path=/blanche/entrustdetail&notice="+21; String URL = "https://lab.wisenergy.cn/lab-bangye?id="+12+"&path=/blanche/entrustdetail&notice="+21;
String a = URLUtil.encodeAll(URL); String a = URLUtil.encodeAll(URL);
String b = URLUtil.encode(URL).replaceAll("&","%26"); String b = URLUtil.encode(URL).replaceAll("&","%26");
...@@ -1172,7 +1178,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -1172,7 +1178,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if(sampleList == null || sampleList.size()==0){ if(sampleList == null || sampleList.size()==0){
return BaseResponse.errorMsg("样品等待检测"); return BaseResponse.errorMsg("样品等待检测");
} }
List<SampleVo> sampleVoList = new ArrayList<>(); List<SampleVo> sampleVoList = new ArrayList<>();
if (sampleList != null && sampleList.size() > 0) { if (sampleList != null && sampleList.size() > 0) {
......
...@@ -433,7 +433,7 @@ public class CheckCountUtil { ...@@ -433,7 +433,7 @@ public class CheckCountUtil {
BigDecimal elseResult = displaySO3.multiply(new BigDecimal(2.5)); BigDecimal elseResult = displaySO3.multiply(new BigDecimal(2.5));
BigDecimal countResult = weightSO3.compareTo(new BigDecimal(0))==1? BigDecimal countResult = weightSO3.compareTo(new BigDecimal(0))==1?
weightSO3:elseResult; weightSO3:elseResult;
BigDecimal result1 = countResult.multiply(param1000); BigDecimal result1 = countResult.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){ //如果结果为奇数
BigDecimal jsResult = weightSO3.compareTo(new BigDecimal(0))==1? BigDecimal jsResult = weightSO3.compareTo(new BigDecimal(0))==1?
...@@ -444,6 +444,7 @@ public class CheckCountUtil { ...@@ -444,6 +444,7 @@ public class CheckCountUtil {
weightSO3:elseResult.multiply(mSO3).divide(mSO3,4); weightSO3:elseResult.multiply(mSO3).divide(mSO3,4);
count = osResult.subtract(new BigDecimal(0.00000000001)).setScale(2,BigDecimal.ROUND_HALF_UP); count = osResult.subtract(new BigDecimal(0.00000000001)).setScale(2,BigDecimal.ROUND_HALF_UP);
} }
}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)).setScale(2, BigDecimal.ROUND_HALF_EVEN); count = displaySO3.multiply(new BigDecimal(2.5)).setScale(2, BigDecimal.ROUND_HALF_EVEN);
......
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