检查表导出bug

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

@@ -107,11 +107,11 @@ public class BusJcbDmcgyqController extends BaseController {
         WordUtils wordUtil = new WordUtils();
         //填充变量
         Map<String, Object> params = new HashMap<>();
-        params.put("${fenxiang}", info.getFenxiang());
+        params.put("${fenxiang}", info.getFenxiang() == null ? "" : info.getFenxiang());
         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("${xingbie}", info.getXingbieText());
         params.put("${dgqwgAzlg}", StringUtils.yesOrNo(info.getDgqwgAzlg()));
         params.put("${dgqwgWzws}", StringUtils.yesOrNo(info.getDgqwgWzws()));
         params.put("${dgqwgBmqj}", StringUtils.yesOrNo(info.getDgqwgBmqj()));
@@ -124,7 +124,7 @@ public class BusJcbDmcgyqController extends BaseController {
         params.put("${jianchariqi}", info.getCheckDate().toString());
         params.put("${jcr}", info.getCheckUser());
         params.put("${sbzt}", StringUtils.YES_VALUE.equals(info.getSbzt()) ? "合格" : "不合格");
-        params.put("${qrr}", info.getConfirmUser());
+        params.put("${qrr}", info.getConfirmUser() == null ? "" : info.getConfirmUser());
         params.put("${czwt}", info.getCzwt() == null ? "" : info.getCzwt());
 
         //生成word文件的文件名

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

@@ -5,6 +5,7 @@ import com.railway.business.catenary.service.IBusJcbJcxcService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
+import com.railway.common.utils.DateUtils;
 import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.poi.EasyExcelUtil;
 import com.railway.common.utils.poi.WordUtils;
@@ -109,14 +110,9 @@ 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() == null ? "" : info.getTemperature());
-        if(info.getCheckDate() != null) {
-            LocalDate jcrqArr = info.getCheckDate();
-            params.put("${year}", jcrqArr.getYear());
-            params.put("${month}", jcrqArr.getMonthValue());
-            params.put("${day}", jcrqArr.getDayOfMonth());
-        }
+        params.put("${qj}", info.getStationName());
+        params.put("${wendu}", info.getTemperature() == null ? "" : info.getTemperature());
+        params.put("${jcrq}", DateUtils.parseCheckDate(info.getCheckDate()));
         params.put("${gz1lcz}", info.getGz1lcz().toString());
         params.put("${gz2lcz}", info.getGz2lcz().toString());
         params.put("${zglcz}", info.getZglcz().toString());
@@ -139,7 +135,7 @@ public class BusJcbJcxcController extends BaseController {
         params.put("${dljxzt}", StringUtils.yesOrNo(info.getDljxzt()));
         params.put("${jcr}", info.getCheckUser());
         params.put("${sbzt}", StringUtils.YES_VALUE.equals(info.getSbzt()) ? "合格" : "不合格");
-        params.put("${qrr}", info.getConfirmUser());
+        params.put("${qrr}", info.getConfirmUser() == null ? "" : info.getConfirmUser());
         params.put("${czwt}", info.getCzwt() == null ? "" : info.getCzwt());
 
         //生成word文件的文件名