1、导出文件文字内容修改

2、导出文件日期非空处理

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/impl/WorkorderExcelServiceImpl.java

@@ -306,7 +306,7 @@ public class WorkorderExcelServiceImpl implements WorkorderExcelService {
         Cell cell34 = row3.createCell(3);
         cell34.setCellValue(generalStepone.getPiston1());
         Cell cell35 = row3.createCell(4);
-        cell35.setCellValue("划片料号1");
+        cell35.setCellValue("滑片料号1");
         Cell cell36 = row3.createCell(5);
         cell36.setCellValue(generalStepone.getScribing1());
         Cell cell37 = row3.createCell(6);
@@ -326,7 +326,7 @@ public class WorkorderExcelServiceImpl implements WorkorderExcelService {
         Cell cell44 = row4.createCell(3);
         cell44.setCellValue(generalStepone.getPiston2());
         Cell cell45 = row4.createCell(4);
-        cell45.setCellValue("划片料号2");
+        cell45.setCellValue("滑片料号2");
         Cell cell46 = row4.createCell(5);
         cell46.setCellValue(generalStepone.getScribing2());
         Cell cell47 = row4.createCell(6);
@@ -437,7 +437,9 @@ public class WorkorderExcelServiceImpl implements WorkorderExcelService {
         Cell cell33 = row3.createCell(2);
         cell33.setCellValue("日期");
         Cell cell34 = row3.createCell(3);
-        cell34.setCellValue(new DateTime(generalSteptwo.getCurrentdate()).toString("yyyy-MM-dd"));//日期格式处理
+        if(null != generalSteptwo.getCurrentdate()){
+            cell34.setCellValue(new DateTime(generalSteptwo.getCurrentdate()).toString("yyyy-MM-dd"));//日期格式处理
+        }
         Cell cell35 = row3.createCell(4);
         cell35.setCellValue("中试确认");
         Cell cell36 = row3.createCell(5);
@@ -535,7 +537,9 @@ public class WorkorderExcelServiceImpl implements WorkorderExcelService {
         Cell cell33 = row3.createCell(2);
         cell33.setCellValue("日期");
         Cell cell34 = row3.createCell(3);
-        cell34.setCellValue(new DateTime(generalStepthree.getCurrentdate()).toString("yyyy-MM-dd"));//日期格式处理
+        if(null != generalStepthree.getCurrentdate()){
+            cell34.setCellValue(new DateTime(generalStepthree.getCurrentdate()).toString("yyyy-MM-dd"));//日期格式处理
+        }
         Cell cell35 = row3.createCell(4);
         cell35.setCellValue("中试确认");
         Cell cell36 = row3.createCell(5);
@@ -632,7 +636,9 @@ public class WorkorderExcelServiceImpl implements WorkorderExcelService {
         Cell cell33 = row3.createCell(2);
         cell33.setCellValue("日期");
         Cell cell34 = row3.createCell(3);
-        cell34.setCellValue(new DateTime(generalStepfour.getCurrentdate()).toString("yyyy-MM-dd"));//日期格式处理
+        if(null != generalStepfour.getCurrentdate()){
+            cell34.setCellValue(new DateTime(generalStepfour.getCurrentdate()).toString("yyyy-MM-dd"));//日期格式处理
+        }
         Cell cell35 = row3.createCell(4);
         cell35.setCellValue("中试确认");
         Cell cell36 = row3.createCell(5);