Merge remote-tracking branch 'origin/dev' into dev

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/boiler/QC10033_202400ReportOFData.java

@@ -114,11 +114,21 @@ public class QC10033_202400ReportOFData implements IDynamicOFData {
                     result.put("medium",equipBoilerDO.getTestmedium());
                     result.put("temperature",equipBoilerDO.getRatedExportTemperature());
 
-                    //下次检验日期
+                    //下次外检日期
                     if (taskOrderDO != null && taskOrderDO.getCheckDate() != null){
                         LocalDate nextYearCheckDate = taskOrderDO.getCheckDate().plusYears(1).minusDays(1);
                         result.put("nextOutCheckDate1_yearMonth",nextYearCheckDate.format(dateFormatMonthYear));
                     }
+
+                    //下次内检日期
+                    if (equipBoilerDO.getNextInCheckDate() != null){
+                        result.put("nextInCheckDate1_yearMonth",equipBoilerDO.getNextInCheckDate().format(dateFormatMonthYear));
+                    }
+
+                    //下次耐压检验日期
+                    if (equipBoilerDO.getNextPressureCheckDate() != null){
+                        result.put("nextPressureCheckDate1_yearMonth",equipBoilerDO.getNextPressureCheckDate().format(dateFormatMonthYear));
+                    }
                 }
 
             }