Commit ab3bd93f authored by tianyiming's avatar tianyiming

气瓶追溯修改

parent 6c039149
...@@ -70,7 +70,7 @@ public class TzCylinderFillingDto { ...@@ -70,7 +70,7 @@ public class TzCylinderFillingDto {
/** /**
* 室温 * 室温
*/ */
private Double temperature; private String temperature;
@ApiModelProperty(value = "异常情况") @ApiModelProperty(value = "异常情况")
/** /**
* 异常情况 * 异常情况
......
...@@ -25,9 +25,11 @@ import com.yeejoin.amos.boot.module.cylinder.flc.api.service.ITzCylinderService; ...@@ -25,9 +25,11 @@ import com.yeejoin.amos.boot.module.cylinder.flc.api.service.ITzCylinderService;
import com.yeejoin.amos.feign.privilege.Privilege; import com.yeejoin.amos.feign.privilege.Privilege;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; 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 java.text.DecimalFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
...@@ -123,6 +125,8 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind ...@@ -123,6 +125,8 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
} }
for (TzCylinderFillingDto tzCylinderFillingDto : tzCylinderFillingDtoList) { for (TzCylinderFillingDto tzCylinderFillingDto : tzCylinderFillingDtoList) {
Double fillingQuantity = Double.valueOf(ObjectUtils.isEmpty(tzCylinderFillingDto.getFillingQuantity()) ? "0" : tzCylinderFillingDto.getFillingQuantity());
tzCylinderFillingDto.setFillingQuantity(new DecimalFormat("#.00").format(fillingQuantity));
if (!ValidationUtil.isEmpty(tzCylinderFillingDto) && !ValidationUtil.isEmpty(tzCylinderFillingDto.getAbnormal())) { if (!ValidationUtil.isEmpty(tzCylinderFillingDto) && !ValidationUtil.isEmpty(tzCylinderFillingDto.getAbnormal())) {
tzCylinderFillingDto.setAbnormal(CyclinderStatus.getName(String.valueOf(tzCylinderFillingDto.getAbnormal()))); tzCylinderFillingDto.setAbnormal(CyclinderStatus.getName(String.valueOf(tzCylinderFillingDto.getAbnormal())));
} }
......
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