Ver Fonte

【BUG】修复导出word有的字段为null导出不对的问题。

fenghao há 4 anos atrás
pai
commit
04e36b21a4

+ 6 - 6
railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbGlkgController.java

@@ -117,9 +117,9 @@ public class BusJcbGlkgController extends BaseController {
         WordUtils wordUtil = new WordUtils();
         //填充变量
         Map<String, Object> params = new HashMap<>();
-        params.put("${kgh}", info.getKgbh());
-        params.put("${qj}", info.getStationName());
-        params.put("${wd}", info.getTemperature());
+        params.put("${kgh}", info.getKgbh() == null ? "" : info.getKgbh());
+        params.put("${qj}", info.getStationName() == null ? "" : info.getStationName());
+        params.put("${wd}", info.getTemperature() == null ? "" : info.getTemperature());
         params.put("${jcrq}", DateUtils.parseCheckDate(info.getCheckDate()));
         params.put("${jgxA}", StringUtils.yesOrNo(info.getJgxA()));
         params.put("${jgxB}", StringUtils.yesOrNo(info.getJgxB()));
@@ -151,9 +151,9 @@ public class BusJcbGlkgController extends BaseController {
         params.put("${kgjgxjdztA}", StringUtils.yesOrNo(info.getKgjgxjdztA()));
         params.put("${kgjgxjdztDzz}", StringUtils.getSlash(info.getKgjgxjdztDzz()));
         params.put("${sbzt}", StringUtils.YES_VALUE.equals(info.getSbzt()) ? "合格" : "不合格");
-        params.put("${jcr}", info.getCheckUser());
-        params.put("${qrr}", info.getConfirmUser());
-        params.put("${czwt}", info.getCzwt());
+        params.put("${jcr}", info.getCheckUser() == null ? "" : info.getCheckUser());
+        params.put("${qrr}", info.getConfirmUser() == null ? "" : info.getConfirmUser());
+        params.put("${czwt}", info.getCzwt() == null ? "" : info.getCzwt());
 
         //生成word文件的文件名
         String fileName = "隔离开关手册.docx";