1

fhKeeper/formulahousekeeper/management-platform-import/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -4031,54 +4031,54 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             Cell cell=null;
                             switch (i+1){
                                 case 1:
-                                    if(row.getCell(7)!=null){
-                                        cell =sheet.getRow(0).getCell(7);
-                                        if(cell!=null&&(cell.getStringCellValue().contains("日期")||cell.getStringCellValue().contains("时间"))){
-                                            row.getCell(7).setCellType(CellType.NUMERIC);
+                                    cell =sheet.getRow(0).getCell(7);
+                                    if(cell!=null&&(cell.getStringCellValue().contains("日期")||cell.getStringCellValue().contains("时间"))){
+                                        row.getCell(7).setCellType(CellType.NUMERIC);
+                                        if(row.getCell(7).getDateCellValue()!=null){
                                             String format = sdf.format(row.getCell(7).getDateCellValue());
                                             report.setPlate1(format);
-                                        }else report.setPlate1(row.getCell(7).getStringCellValue());
-                                    }
+                                        }
+                                    }else report.setPlate1(row.getCell(7).getStringCellValue());
                                 break;
                                 case 2:
-                                    if(row.getCell(8)!=null){
-                                        cell = sheet.getRow(0).getCell(8);
-                                        if(cell!=null&&(cell.getStringCellValue().contains("日期")||cell.getStringCellValue().contains("时间"))){
-                                            row.getCell(8).setCellType(CellType.NUMERIC);
-                                            String format =sdf.format(row.getCell(8).getDateCellValue());
-                                            report.setPlate2(dtf.format(LocalDate.parse(format, dtf)));
-                                        }else  report.setPlate2(row.getCell(8).getStringCellValue());
-                                    }
+                                    cell = sheet.getRow(0).getCell(8);
+                                    if(cell!=null&&(cell.getStringCellValue().contains("日期")||cell.getStringCellValue().contains("时间"))){
+                                        row.getCell(8).setCellType(CellType.NUMERIC);
+                                        if(row.getCell(8).getDateCellValue()!=null){
+                                            String format = sdf.format(row.getCell(8).getDateCellValue());
+                                            report.setPlate5(format);
+                                        }
+                                    }else  report.setPlate2(row.getCell(8).getStringCellValue());
                                 break;
                                 case 3:
-                                    if(row.getCell(9)!=null){
-                                        cell = sheet.getRow(0).getCell(9);
-                                        if(cell!=null&&(cell.getStringCellValue().contains("日期")||cell.getStringCellValue().contains("时间"))){
-                                            row.getCell(9).setCellType(CellType.NUMERIC);
+                                    cell = sheet.getRow(0).getCell(9);
+                                    if(cell!=null&&(cell.getStringCellValue().contains("日期")||cell.getStringCellValue().contains("时间"))){
+                                        row.getCell(9).setCellType(CellType.NUMERIC);
+                                        if(row.getCell(9).getDateCellValue()!=null){
                                             String format = sdf.format(row.getCell(9).getDateCellValue());
-                                            report.setPlate3(format);
-                                        }else  report.setPlate3(row.getCell(9).getStringCellValue());
-                                    }
+                                            report.setPlate5(format);
+                                        }
+                                    }else  report.setPlate3(row.getCell(9).getStringCellValue());
                                 break;
                                 case 4:
-                                    if(row.getCell(10)!=null){
-                                        cell = sheet.getRow(0).getCell(10);
-                                        if(cell!=null&&(cell.getStringCellValue().contains("日期")||cell.getStringCellValue().contains("时间"))){
-                                            row.getCell(10).setCellType(CellType.NUMERIC);
+                                    cell = sheet.getRow(0).getCell(10);
+                                    if(cell!=null&&(cell.getStringCellValue().contains("日期")||cell.getStringCellValue().contains("时间"))){
+                                        row.getCell(10).setCellType(CellType.NUMERIC);
+                                        if(row.getCell(10).getDateCellValue()!=null){
                                             String format = sdf.format(row.getCell(10).getDateCellValue());
-                                            report.setPlate4(format);
-                                        }else  report.setPlate4(row.getCell(10).getStringCellValue());
-                                    }
+                                            report.setPlate5(format);
+                                        }
+                                    }else  report.setPlate4(row.getCell(10).getStringCellValue());
                                 break;
                                 case 5:
-                                    if(row.getCell(11)!=null){
-                                        cell = sheet.getRow(0).getCell(11);
-                                        if(cell!=null&&(cell.getStringCellValue().contains("日期")||cell.getStringCellValue().contains("时间"))){
-                                            row.getCell(11).setCellType(CellType.NUMERIC);
+                                    cell = sheet.getRow(0).getCell(11);
+                                    if(cell!=null&&(cell.getStringCellValue().contains("日期")||cell.getStringCellValue().contains("时间"))){
+                                        row.getCell(11).setCellType(CellType.NUMERIC);
+                                        if(row.getCell(11).getDateCellValue()!=null){
                                             String format = sdf.format(row.getCell(11).getDateCellValue());
                                             report.setPlate5(format);
-                                        }else  report.setPlate5(row.getCell(11).getStringCellValue());
-                                    }
+                                        }
+                                    }else  report.setPlate5(row.getCell(11).getStringCellValue());
                                 break;
                             }
                         }