|
|
@@ -339,7 +339,7 @@ public class BoilerTaskOrderInspectionServiceImpl implements BoilerTaskOrderInsp
|
|
|
boilerOpinionReportedExcelVo.setSendTime(item.getSendTime());
|
|
|
boilerOpinionReportedExcelVo.setSignTime(item.getSignTime());
|
|
|
boilerOpinionReportedExcelVo.setRectificationTime(item.getRectificationTime());
|
|
|
- boilerOpinionReportedExcelVo.setCheckUserName(item.getCheckUsers().get(0).getNickname());
|
|
|
+ boilerOpinionReportedExcelVo.setCheckUserName(item.getCheckUsers()==null?"" :item.getCheckUsers().get(0).getNickname());
|
|
|
boilerOpinionReportedExcelVo.setRectificationStatusName(rectificationStatusMap.get(item.getRectificationStatus()));
|
|
|
if (item.getRectificationStatus() == 0){
|
|
|
boilerOpinionReportedExcelVo.setConfirmationTimeStr(item.getConfirmationTimeStr());
|
|
|
@@ -357,9 +357,9 @@ public class BoilerTaskOrderInspectionServiceImpl implements BoilerTaskOrderInsp
|
|
|
.map(DictDataRespDTO::getLabel)
|
|
|
.findFirst()
|
|
|
.orElse(""));
|
|
|
- boilerOpinionReportedExcelVo.setCheckDate(item.getCheckDate().getYear()+"-"+item.getCheckDate().getMonthValue()+"-"+item.getCheckDate().getDayOfMonth());
|
|
|
+ boilerOpinionReportedExcelVo.setCheckDate(item.getCheckDate()==null||item.getCheckDate().getYear()==0?"":item.getCheckDate().getYear()+"-"+item.getCheckDate().getMonthValue()+"-"+item.getCheckDate().getDayOfMonth());
|
|
|
boilerOpinionReportedExcelVo.setDeptName(item.getDeptName());
|
|
|
- boilerOpinionReportedExcelVo.setHandleUserNickname(item.getHandlerUserList().get(0).getNickname());
|
|
|
+ boilerOpinionReportedExcelVo.setHandleUserNickname(item.getHandlerUserList()==null? "":item.getHandlerUserList().get(0).getNickname());
|
|
|
list.add(boilerOpinionReportedExcelVo);
|
|
|
}
|
|
|
}
|