|
@@ -170,7 +170,11 @@ public class DonorMaterialService extends CrudService<DonorMaterialMapper, Donor
|
|
|
Row row = importExcel.getRow(i);
|
|
|
if (null != row) {
|
|
|
String cellOne = this.getCellValue(row.getCell(1));
|
|
|
- String cellTwo = this.getCellValue(row.getCell(2));
|
|
|
+ Cell cell=row.getCell(2);
|
|
|
+ if (cell.getCellType()!=1){
|
|
|
+ cell.setCellType(1);
|
|
|
+ }
|
|
|
+ String cellTwo = cell.getStringCellValue();
|
|
|
if (null!=cellTwo && !"".equals(cellTwo) && !"无".equals(cellTwo) && !"0".equals(cellTwo)) {
|
|
|
donorMaterial.setProjectName(projectName);
|
|
|
donorMaterial.setProjectId(projectId);
|