|
@@ -546,8 +546,10 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
|
|
|
endMap.put("act",list5);
|
|
|
endMap.put("bat",list6);
|
|
|
|
|
|
- String format = String.format("%.2f", earTemp1.get(earmark.length()));
|
|
|
- record.setEarTemp1(Float.parseFloat(format));
|
|
|
+ if (ObjectUtil.isNotEmpty(earTemp1)){
|
|
|
+ String format = String.format("%.2f", earTemp1.get(earTemp1.size()-1));
|
|
|
+ record.setEarTemp1(Float.parseFloat(format));
|
|
|
+ }
|
|
|
record.setDetail(endMap);
|
|
|
}
|
|
|
map.put("countOff",allCount-onCount);
|