Merge remote-tracking branch 'origin/master'

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevCcController.java

@@ -446,8 +446,13 @@ public class TSpecdevCcController extends BaseController
             row.createCell(1).setCellValue(t.getPlantCode());
             row.createCell(2).setCellValue(t.getCarNo());
             row.createCell(3).setCellValue(t.getDocno());
-            row.createCell(4).setCellValue(t.getWarnDate());
-            row.createCell(5).setCellValue(t.getNextWarnDate());
+            if (t.getWarnDate()!= null){
+                row.createCell(4).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getWarnDate()));
+            }
+            if (t.getNextWarnDate()!= null){
+                row.createCell(5).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getNextWarnDate()));
+
+            }
             row.createCell(6).setCellValue(t.getReportNo());
             row.createCell(7).setCellValue(t.getPerTestConclusion());
             rowIndex++;

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevDtController.java

@@ -432,12 +432,12 @@ public class TSpecdevDtController extends BaseController
             row.createCell(3).setCellValue(t.getModel());
             row.createCell(4).setCellValue(t.getLocation());
             if (t.getWarnDate()!= null){
-                row.createCell(5).setCellValue(new SimpleDateFormat("yyyy-mm-dd").format(t.getWarnDate()));
+                row.createCell(5).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getWarnDate()));
             }
             row.createCell(6).setCellValue(t.getCheckUnit());
             row.createCell(7).setCellValue(t.getReportNo());
             if (t.getNextWarnDate()!= null){
-                row.createCell(8).setCellValue(new SimpleDateFormat("yyyy-mm-dd").format(t.getNextWarnDate()));
+                row.createCell(8).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getNextWarnDate()));
             }
             row.createCell(9).setCellValue(t.getPerTestConclusion());
             rowIndex++;

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevDzsbController.java

@@ -444,7 +444,6 @@ public class TSpecdevDzsbController extends BaseController
             if (t.getWarnDate()!= null){
                 row.createCell(6).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getWarnDate()));
             }
-
             row.createCell(7).setCellValue(t.getReportNo());
             if (t.getNextWarnDate()!= null){
                 row.createCell(8).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getNextWarnDate()));

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevGlController.java

@@ -506,7 +506,6 @@ public class TSpecdevGlController extends BaseController
             if (t.getOutWarnDate()!= null){
                 row.createCell(10).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getOutWarnDate()));
             }
-
             row.createCell(11).setCellValue(t.getOutCheckConclusion());
             row.createCell(12).setCellValue(t.getOutReportNo());
             if (t.getOutNextWarnDate()!= null){

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlgdController.java

@@ -516,7 +516,6 @@ public class TSpecdevYlgdController extends BaseController {
             if (t.getWarnDate()!= null){
                 row.createCell(6).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getWarnDate()));
             }
-
             row.createCell(7).setCellValue(t.getSafeClass());
             row.createCell(8).setCellValue(t.getReportNo());
             if (t.getNextWarnDate()!= null){
@@ -525,13 +524,11 @@ public class TSpecdevYlgdController extends BaseController {
             if (t.getYearWarnDate()!= null){
                 row.createCell(10).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getYearWarnDate()));
             }
-
             row.createCell(11).setCellValue(t.getCheckConclusion());
             if (t.getYearNextWarnDate()!= null){
                 row.createCell(12).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getYearNextWarnDate()));
             }
             row.createCell(13).setCellValue(t.getYearReportNo());
-
             rowIndex++;
         }
         OutputStream out = null;

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlrqController.java

@@ -540,7 +540,6 @@ public class TSpecdevYlrqController extends BaseController
             if (t.getWarnDate()!= null){
                 row.createCell(6).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getWarnDate()));
             }
-
             row.createCell(7).setCellValue(t.getSafeClass());
             row.createCell(8).setCellValue(t.getReportNo());
             if (t.getNextWarnDate()!= null){