|
|
|
@ -617,7 +617,6 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio |
|
|
|
continue; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (list.get(i).get(0).equals("TEST")) { |
|
|
|
EquipmentDataDetail equipmentDataDetail = new EquipmentDataDetail(); |
|
|
|
equipmentDataDetail.setEquipmentNo(excel.getEquipmentNo()); |
|
|
|
@ -629,16 +628,15 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio |
|
|
|
equipmentDataDetail.setCreateDate(new Date()); |
|
|
|
equipmentDataDetail.setValue0(list.get(i).get(1)); |
|
|
|
equipmentDataDetail.setValue1(list.get(i).get(3)); |
|
|
|
|
|
|
|
equipmentDataDetail.setNum(index); |
|
|
|
equipmentDataDetails.add(equipmentDataDetail); |
|
|
|
index++; |
|
|
|
} |
|
|
|
} |
|
|
|
if (CollectionUtils.isNotEmpty(entityList)){ |
|
|
|
for (EquipmentFolderDetailEntity one : entityList) { |
|
|
|
for (EquipmentDataDetail equipmentDataDetail : equipmentDataDetails) { |
|
|
|
if (StringUtils.equals(one.getCollectionSource(), "value0")){ |
|
|
|
|
|
|
|
double value = Double.parseDouble(equipmentDataDetail.getValue0()); |
|
|
|
if (StringUtils.isNotEmpty(one.getDefaultValue())) { |
|
|
|
//规定参数 |
|
|
|
@ -676,7 +674,6 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return equipmentDataDetails; |
|
|
|
} |
|
|
|
|
|
|
|
@ -877,5 +874,6 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|