Explorar el Código

徐明浩
压力容器年检报告-批量下载历史数据导出限制脏数据打算程序
压力管道年检报告-批量下载历史数据导出限制脏数据打算程序

徐明浩 hace 3 años
padre
commit
fbf2aed51f

+ 4 - 0
master/src/main/java/com/ruoyi/project/sems/controller/TReportHiYlgdController.java

@@ -246,6 +246,10 @@ public class TReportHiYlgdController extends BaseController {
                 }
                 map.put("reportHiYlgd", tReportHiYlgd);
                 TReportYlgd reportYlgd = tReportYlgdService.selectTReportYlgdById(tReportHiYlgd.getReportId());
+                //如果出现无法获取的基础数据,可能是以往的脏数据,选择跳过当前数据项
+                if(reportYlgd == null){
+                    continue;
+                }
                 TSpecdevYlgd devYlgd = tSpecdevYlgdService.selectTSpecdevYlgdById(reportYlgd.getDevId());
                 map.put("devYlgd", devYlgd);
                 if (tReportHiYlgd.getCheckDate() != null) {

+ 4 - 0
master/src/main/java/com/ruoyi/project/sems/controller/TReportHiYlrqController.java

@@ -247,6 +247,10 @@ public class TReportHiYlrqController extends BaseController {
                 }
                 map.put("reportHiYlrq", tReportHiYlrq);
                 TReportYlrq reportYlrq = tReportYlrqService.selectTReportYlrqById(tReportHiYlrq.getReportId());
+                //如果出现无法获取的基础数据,可能是以往的脏数据,选择跳过当前数据项
+                if(reportYlrq == null){
+                    continue;
+                }
                 TSpecdevYlrq devYlrq = tSpecdevYlrqService.selectTSpecdevYlrqById(reportYlrq.getDevId());
                 map.put("devYlrq", devYlrq);
                 if (tReportHiYlrq.getCheckDate() != null) {