Commit aee4bae4 authored by 刘林's avatar 刘林

fix(jg):【现场问题】车用气瓶使用标志容积小数计算问题(70.2+30.6 算出来一堆000000000)

parent fd293497
...@@ -67,9 +67,9 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil; ...@@ -67,9 +67,9 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest; import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.File; import java.io.File;
import java.math.BigDecimal;
import java.nio.file.Files; import java.nio.file.Files;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDate; import java.time.LocalDate;
...@@ -78,7 +78,6 @@ import java.util.*; ...@@ -78,7 +78,6 @@ import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XIAN_YANG; import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XIAN_YANG;
import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XI_XIAN; import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XI_XIAN;
import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl.getAuditPassedDate; import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl.getAuditPassedDate;
...@@ -310,9 +309,10 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform ...@@ -310,9 +309,10 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
vehicleInformation.setRegDate(new Date()); vehicleInformation.setRegDate(new Date());
vehicleInformation.setCreateUserName(reginParams.getUserModel().getRealName()); vehicleInformation.setCreateUserName(reginParams.getUserModel().getRealName());
vehicleInformation.setGasNum(equipmentLists.size()); vehicleInformation.setGasNum(equipmentLists.size());
vehicleInformation.setVolume(String.valueOf(equipmentLists.stream() BigDecimal totalVolume = equipmentLists.stream()
.mapToDouble(x -> Double.parseDouble(String.valueOf(x.get("singleBottleVolume")))) .map(x -> new BigDecimal(String.valueOf(x.get("singleBottleVolume"))))
.sum())); .reduce(BigDecimal.ZERO, BigDecimal::add);
vehicleInformation.setVolume(totalVolume.toPlainString());
vehicleInformation.setFillingMedium(equipmentLists.get(0).get("chargingMedium") + ""); vehicleInformation.setFillingMedium(equipmentLists.get(0).get("chargingMedium") + "");
boolean hasId = StringUtils.isEmpty(vehicleInfoDto.getSequenceNbr()); boolean hasId = StringUtils.isEmpty(vehicleInfoDto.getSequenceNbr());
...@@ -1809,10 +1809,10 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform ...@@ -1809,10 +1809,10 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
vehicleInformation.setRegDate(new Date()); vehicleInformation.setRegDate(new Date());
vehicleInformation.setCreateUserName(reginParams.getUserModel().getRealName()); vehicleInformation.setCreateUserName(reginParams.getUserModel().getRealName());
vehicleInformation.setGasNum(equipmentLists.size()); vehicleInformation.setGasNum(equipmentLists.size());
vehicleInformation.setVolume(String.valueOf(equipmentLists.stream() BigDecimal totalVolume = equipmentLists.stream()
.mapToDouble(x -> Double.parseDouble(String.valueOf(x.get("singleBottleVolume")))) .map(x -> new BigDecimal(String.valueOf(x.get("singleBottleVolume"))))
.sum())); .reduce(BigDecimal.ZERO, BigDecimal::add);
vehicleInformation.setFillingMedium(equipmentLists.get(0).get("chargingMedium") + ""); vehicleInformation.setVolume(totalVolume.toPlainString());
vehicleInformation.setAuditPassDate(new Date()); vehicleInformation.setAuditPassDate(new Date());
// 登记证记录表主键 // 登记证记录表主键
......
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