|
|
|
@ -332,34 +332,34 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio |
|
|
|
equipmentDataDetail.setItemNo(excel.getItemNo()); |
|
|
|
equipmentDataDetail.setFileNo(excel.getFileNo()); |
|
|
|
equipmentDataDetail.setCreateDate(new Date()); |
|
|
|
equipmentDataDetail.setValue0(data[0]); |
|
|
|
equipmentDataDetail.setValue0(data[0].trim()); |
|
|
|
|
|
|
|
if (data.length > 1) { |
|
|
|
equipmentDataDetail.setValue1(data[1]); |
|
|
|
equipmentDataDetail.setValue1(data[1].trim()); |
|
|
|
} |
|
|
|
if (data.length > 2) { |
|
|
|
equipmentDataDetail.setValue2(data[2]); |
|
|
|
equipmentDataDetail.setValue2(data[2].trim()); |
|
|
|
} |
|
|
|
if (data.length > 3) { |
|
|
|
equipmentDataDetail.setValue3(data[3]); |
|
|
|
equipmentDataDetail.setValue3(data[3].trim()); |
|
|
|
} |
|
|
|
if (data.length > 4) { |
|
|
|
equipmentDataDetail.setValue4(data[4]); |
|
|
|
equipmentDataDetail.setValue4(data[4].trim()); |
|
|
|
} |
|
|
|
if (data.length > 5) { |
|
|
|
equipmentDataDetail.setValue5(data[5]); |
|
|
|
equipmentDataDetail.setValue5(data[5].trim()); |
|
|
|
} |
|
|
|
if (data.length > 6) { |
|
|
|
equipmentDataDetail.setValue6(data[6]); |
|
|
|
equipmentDataDetail.setValue6(data[6].trim()); |
|
|
|
} |
|
|
|
if (data.length > 7) { |
|
|
|
equipmentDataDetail.setValue7(data[7]); |
|
|
|
equipmentDataDetail.setValue7(data[7].trim()); |
|
|
|
} |
|
|
|
if (data.length > 8) { |
|
|
|
equipmentDataDetail.setValue8(data[8]); |
|
|
|
equipmentDataDetail.setValue8(data[8].trim()); |
|
|
|
} |
|
|
|
if (data.length > 9) { |
|
|
|
equipmentDataDetail.setValue9(data[9]); |
|
|
|
equipmentDataDetail.setValue9(data[9].trim()); |
|
|
|
} |
|
|
|
equipmentDataDetail.setGroupValue(group); |
|
|
|
|
|
|
|
@ -424,8 +424,8 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio |
|
|
|
equipmentDataDetail.setItemNo(excel.getItemNo()); |
|
|
|
equipmentDataDetail.setFileNo(excel.getFileNo()); |
|
|
|
equipmentDataDetail.setCreateDate(new Date()); |
|
|
|
equipmentDataDetail.setValue0(list.get(i).get(1)); |
|
|
|
equipmentDataDetail.setValue1(list.get(i).get(3)); |
|
|
|
equipmentDataDetail.setValue0(list.get(i).get(1).trim()); |
|
|
|
equipmentDataDetail.setValue1(list.get(i).get(3).trim()); |
|
|
|
equipmentDataDetail.setNum(index); |
|
|
|
equipmentDataDetails.add(equipmentDataDetail); |
|
|
|
index++; |
|
|
|
@ -470,15 +470,17 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio |
|
|
|
equipmentDataDetail.setItemNo(excel.getItemNo()); |
|
|
|
equipmentDataDetail.setFileNo(excel.getFileNo()); |
|
|
|
equipmentDataDetail.setCreateDate(new Date()); |
|
|
|
equipmentDataDetail.setValue0(data[0]); |
|
|
|
|
|
|
|
equipmentDataDetail.setValue0(data[0].trim()); |
|
|
|
if (data.length > 1) { |
|
|
|
equipmentDataDetail.setValue1(data[1]); |
|
|
|
|
|
|
|
equipmentDataDetail.setValue1(data[1].trim()); |
|
|
|
} |
|
|
|
if (data.length > 2) { |
|
|
|
equipmentDataDetail.setValue2(data[2]); |
|
|
|
equipmentDataDetail.setValue2(data[2].trim()); |
|
|
|
} |
|
|
|
if (data.length > 3) { |
|
|
|
equipmentDataDetail.setValue3(data[3]); |
|
|
|
equipmentDataDetail.setValue3(data[3].trim()); |
|
|
|
} |
|
|
|
equipmentDataDetail.setNum(index); |
|
|
|
detailList.add(equipmentDataDetail); |
|
|
|
|