签名

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/comm/EHSQGR009_202400RecordOFData.java

@@ -110,12 +110,14 @@ public class EHSQGR009_202400RecordOFData implements IDynamicOFData {
                 }
 
                 List<BoilerTaskOrderSignFileDO> list = boilerTaskOrderSignFileService.list(new LambdaQueryWrapper<BoilerTaskOrderSignFileDO>().eq(BoilerTaskOrderSignFileDO::getSecurityCheckId, refId));
-                list.sort(Comparator.comparing(BoilerTaskOrderSignFileDO::getSignDate));
+                list.sort(Comparator.comparing(BoilerTaskOrderSignFileDO::getSignDate, Comparator.nullsFirst(Comparator.naturalOrder())));
                 // 拿到签名文件最新的一个
                 if (!list.isEmpty()){
                     BoilerTaskOrderSignFileDO signFileDO = list.get(list.size()-1);
                     result.put("value17", signFileDO.getSignUrl());
-                    result.put("value18", signFileDO.getSignDate().format(dateFormat));
+                    if (signFileDO.getSignDate() != null) {
+                        result.put("value18", signFileDO.getSignDate().format(dateFormat));
+                    }
                 }
 
                 //进入现场人员信息
@@ -203,12 +205,14 @@ public class EHSQGR009_202400RecordOFData implements IDynamicOFData {
                 }
 
                 List<BoilerTaskOrderSignFileDO> list = boilerTaskOrderSignFileService.list(new LambdaQueryWrapper<BoilerTaskOrderSignFileDO>().eq(BoilerTaskOrderSignFileDO::getSecurityCheckId, refId));
-                list.sort(Comparator.comparing(BoilerTaskOrderSignFileDO::getSignDate));
+                list.sort(Comparator.comparing(BoilerTaskOrderSignFileDO::getSignDate, Comparator.nullsFirst(Comparator.naturalOrder())));
                 // 拿到签名文件最新的一个
                 if (!list.isEmpty()){
                     BoilerTaskOrderSignFileDO signFileDO = list.get(list.size()-1);
                     result.put("value17", signFileDO.getSignUrl());
-                    result.put("value18", signFileDO.getSignDate().format(dateFormat));
+                    if (signFileDO.getSignDate() != null) {
+                        result.put("value18", signFileDO.getSignDate().format(dateFormat));
+                    }
                 }
                 //进入现场人员信息
                 String orderId = securityCheckDO.getOrderId();
@@ -279,4 +283,4 @@ public class EHSQGR009_202400RecordOFData implements IDynamicOFData {
         return result;
 
     }
-}
+}