Browse Source

校验改动1

java8
wenkuan.shi 2 years ago
parent
commit
2a2e5d9e0e
  1. 6
      src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java

6
src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java

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