导出修改

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbDmcgyqController.java

@@ -107,8 +107,8 @@ public class BusJcbDmcgyqController extends BaseController {
         //填充变量
         Map<String, Object> params = new HashMap<>();
         params.put("${fenxiang}", info.getFenxiang());
-        params.put("${tianqi}", info.getTianqi());
-        params.put("${wendu}", info.getTemperature());
+        params.put("${tianqi}", info.getTianqi() == null ? "" : info.getTianqi());
+        params.put("${wendu}", info.getTemperature() == null ? "" : info.getTemperature());
         params.put("${zzhfw}", info.getPillarArea().toString());
         params.put("${xingbie}", info.getXingbie());
         params.put("${dgqwgAzlg}", StringUtils.yesOrNo(info.getDgqwgAzlg()));
@@ -124,7 +124,7 @@ public class BusJcbDmcgyqController extends BaseController {
         params.put("${jcr}", info.getCheckUser());
         params.put("${sbzt}", StringUtils.YES_VALUE.equals(info.getSbzt()) ? "合格" : "不合格");
         params.put("${qrr}", info.getConfirmUser());
-        params.put("${czwt}", info.getCzwt());
+        params.put("${czwt}", info.getCzwt() == null ? "" : info.getCzwt());
 
         //生成word文件的文件名
         String fileName = "地面磁感应手册.docx";

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbJcxcController.java

@@ -108,7 +108,7 @@ public class BusJcbJcxcController extends BaseController {
         Map<String, Object> params = new HashMap<>();
         params.put("${xch}", info.getXch());
         params.put("${stationName()}", info.getStationName());
-        params.put("${temperature}", info.getTemperature());
+        params.put("${temperature}", info.getTemperature() == null ? "" : info.getTemperature());
         if(info.getCheckDate() != null) {
             LocalDate jcrqArr = info.getCheckDate();
             params.put("${year}", jcrqArr.getYear());
@@ -138,7 +138,7 @@ public class BusJcbJcxcController extends BaseController {
         params.put("${jcr}", info.getCheckUser());
         params.put("${sbzt}", StringUtils.YES_VALUE.equals(info.getSbzt()) ? "合格" : "不合格");
         params.put("${qrr}", info.getConfirmUser());
-        params.put("${czwt}", info.getCzwt());
+        params.put("${czwt}", info.getCzwt() == null ? "" : info.getCzwt());
 
         //生成word文件的文件名
         String fileName = "交叉线岔高速手册.docx";